* Re: [PATCH -next] thermal: depends on NET
From: Randy Dunlap @ 2010-12-20 16:47 UTC (permalink / raw)
To: lkml; +Cc: Stephen Rothwell, akpm, Zhang Rui, linux-next, Zimny Lech
In-Reply-To: <20101213112033.d0060e6c.randy.dunlap@oracle.com>
This is still needed in linux-next 20101220.
On Mon, 13 Dec 2010 11:20:33 -0800 Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> ERROR: "genl_register_family" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "genl_unregister_family" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "init_net" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "__alloc_skb" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "netlink_broadcast" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "kfree_skb" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "genl_register_mc_group" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "nla_reserve" [drivers/thermal/thermal_sys.ko] undefined!
> ERROR: "skb_put" [drivers/thermal/thermal_sys.ko] undefined!
>
> Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Zhang Rui <rui.zhang@intel.com>
> ---
> drivers/thermal/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> --- linux-next-20101213.orig/drivers/thermal/Kconfig
> +++ linux-next-20101213/drivers/thermal/Kconfig
> @@ -4,6 +4,7 @@
>
> menuconfig THERMAL
> tristate "Generic Thermal sysfs driver"
> + depends on NET
> help
> Generic Thermal Sysfs driver offers a generic mechanism for
> thermal management. Usually it's made up of one or more thermal
> --
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
desserts: http://www.xenotime.net/linux/recipes/
^ permalink raw reply
* Re: [PATCH] platform/x86: Kconfig: Replace select by depends on ACPI_WMI
From: Sedat Dilek @ 2010-12-20 16:30 UTC (permalink / raw)
To: Matthew Garrett
Cc: LKML, platform-driver-x86, Corentin Chary, Stephen Rothwell,
Randy Dunlap, David Woodhouse, linux-next
In-Reply-To: <20101220161817.GE25502@srcf.ucam.org>
On Mon, Dec 20, 2010 at 5:18 PM, Matthew Garrett <mjg59@srcf.ucam.org> wrote:
> Applied, thanks. It's easier to handle these if you include the patch in
> the email body, rather than as an attachment.
>
> --
> Matthew Garrett | mjg59@srcf.ucam.org
>
[ CC linux-next ]
Thanks :-)!
I mostly use web-based Email, but it's time to setup and use
git-send-email [1] on the working machine.
- Sedat -
[1] http://www.kernel.org/pub/software/scm/git/docs/git-send-email.html
^ permalink raw reply
* Re: [PATCH scsi-misc-2.6] sd: implement sd_check_events()
From: James Bottomley @ 2010-12-20 16:20 UTC (permalink / raw)
To: Tejun Heo
Cc: Stephen Rothwell, Jens Axboe, linux-next, linux-kernel,
Alan Stern, Kay Sievers, linux-scsi
In-Reply-To: <4D0CF27F.1080601@kernel.org>
Added cc: linux-scsi
On Sat, 2010-12-18 at 18:42 +0100, Tejun Heo wrote:
> Replace sd_media_change() with sd_check_events().
>
> * Move media removed logic into set_media_not_present() and
> media_not_present() and set sdev->changed iff an existing media is
> removed or the device indicates UNIT_ATTENTION.
>
> * Make sd_check_events() sets sdev->changed if previously missing
> media becomes present.
>
> * Event is reported only if sdev->changed is set.
>
> This makes media presence event reported if scsi_disk->media_present
> actually changed or the device indicated UNIT_ATTENTION. For backward
> compatibility, SDEV_EVT_MEDIA_CHANGE is generated each time
> sd_check_events() detects media change event.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Kay Sievers <kay.sievers@vrfy.org>
> ---
> Here it is. The conflicts were due to Alan's recent patch, which was
> in the similar direction anyway.
This looks fine to me. Jens can you strip the SCSI patches out of your
tree and I'll run them through a postmerge tree to get the fix up?
James
> Thanks.
>
> drivers/scsi/sd.c | 99 +++++++++++++++++++++++++++---------------------------
> drivers/scsi/sd.h | 1
> 2 files changed, 50 insertions(+), 50 deletions(-)
>
> Index: work/drivers/scsi/sd.c
> ===================================================================
> --- work.orig/drivers/scsi/sd.c
> +++ work/drivers/scsi/sd.c
> @@ -990,30 +990,50 @@ out:
>
> static void set_media_not_present(struct scsi_disk *sdkp)
> {
> + if (sdkp->media_present)
> + sdkp->device->changed = 1;
> sdkp->media_present = 0;
> sdkp->capacity = 0;
> - sdkp->device->changed = 1;
> +}
> +
> +static int media_not_present(struct scsi_disk *sdkp,
> + struct scsi_sense_hdr *sshdr)
> +{
> + if (!scsi_sense_valid(sshdr))
> + return 0;
> +
> + /* not invoked for commands that could return deferred errors */
> + switch (sshdr->sense_key) {
> + case UNIT_ATTENTION:
> + sdkp->device->changed = 1;
> + /* fall through */
> + case NOT_READY:
> + /* medium not present */
> + if (sshdr->asc == 0x3A) {
> + set_media_not_present(sdkp);
> + return 1;
> + }
> + }
> + return 0;
> }
>
> /**
> - * sd_media_changed - check if our medium changed
> - * @disk: kernel device descriptor
> + * sd_check_events - check media events
> + * @disk: kernel device descriptor
> + * @clearing: disk events currently being cleared
> *
> - * Returns 0 if not applicable or no change; 1 if change
> + * Returns mask of DISK_EVENT_*.
> *
> * Note: this function is invoked from the block subsystem.
> **/
> -static int sd_media_changed(struct gendisk *disk)
> +static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing)
> {
> struct scsi_disk *sdkp = scsi_disk(disk);
> struct scsi_device *sdp = sdkp->device;
> struct scsi_sense_hdr *sshdr = NULL;
> int retval;
>
> - SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_media_changed\n"));
> -
> - if (!sdp->removable)
> - return 0;
> + SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_check_events\n"));
>
> /*
> * If the device is offline, don't send any commands - just pretend as
> @@ -1043,40 +1063,37 @@ static int sd_media_changed(struct gendi
> sshdr);
> }
>
> - if (retval) {
> + /* failed to execute TUR, assume media not present */
> + if (host_byte(retval)) {
> set_media_not_present(sdkp);
> goto out;
> }
>
> + if (media_not_present(sdkp, sshdr))
> + goto out;
> +
> /*
> * For removable scsi disk we have to recognise the presence
> - * of a disk in the drive. This is kept in the struct scsi_disk
> - * struct and tested at open ! Daniel Roche (dan@lectra.fr)
> + * of a disk in the drive.
> */
> + if (!sdkp->media_present)
> + sdp->changed = 1;
> sdkp->media_present = 1;
> -
> out:
> /*
> - * Report a media change under the following conditions:
> + * sdp->changed is set under the following conditions:
> *
> - * Medium is present now and wasn't present before.
> - * Medium wasn't present before and is present now.
> - * Medium was present at all times, but it changed while
> - * we weren't looking (sdp->changed is set).
> + * Medium present state has changed in either direction.
> + * Device has indicated UNIT_ATTENTION.
> *
> - * If there was no medium before and there is no medium now then
> - * don't report a change, even if a medium was inserted and removed
> - * while we weren't looking.
> + * Report SDEV_EVT_MEDIA_CHANGE too for backward compatibility.
> */
> - retval = (sdkp->media_present != sdkp->previous_state ||
> - (sdkp->media_present && sdp->changed));
> - if (retval)
> + if (sdp->changed)
> sdev_evt_send_simple(sdp, SDEV_EVT_MEDIA_CHANGE, GFP_KERNEL);
> - sdkp->previous_state = sdkp->media_present;
> -
> - /* sdp->changed indicates medium was changed or is not present */
> - sdp->changed = !sdkp->media_present;
> kfree(sshdr);
> +
> + retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0;
> + sdp->changed = 0;
> return retval;
> }
>
> @@ -1169,7 +1186,7 @@ static const struct block_device_operati
> #ifdef CONFIG_COMPAT
> .compat_ioctl = sd_compat_ioctl,
> #endif
> - .media_changed = sd_media_changed,
> + .check_events = sd_check_events,
> .revalidate_disk = sd_revalidate_disk,
> .unlock_native_capacity = sd_unlock_native_capacity,
> };
> @@ -1305,23 +1322,6 @@ static int sd_done(struct scsi_cmnd *SCp
> return good_bytes;
> }
>
> -static int media_not_present(struct scsi_disk *sdkp,
> - struct scsi_sense_hdr *sshdr)
> -{
> -
> - if (!scsi_sense_valid(sshdr))
> - return 0;
> - /* not invoked for commands that could return deferred errors */
> - if (sshdr->sense_key != NOT_READY &&
> - sshdr->sense_key != UNIT_ATTENTION)
> - return 0;
> - if (sshdr->asc != 0x3A) /* medium not present */
> - return 0;
> -
> - set_media_not_present(sdkp);
> - return 1;
> -}
> -
> /*
> * spinup disk - called only in sd_revalidate_disk()
> */
> @@ -1496,7 +1496,7 @@ static void read_capacity_error(struct s
> */
> if (sdp->removable &&
> sense_valid && sshdr->sense_key == NOT_READY)
> - sdp->changed = 1;
> + set_media_not_present(sdkp);
>
> /*
> * We used to set media_present to 0 here to indicate no media
> @@ -2382,8 +2382,10 @@ static void sd_probe_async(void *data, a
>
> gd->driverfs_dev = &sdp->sdev_gendev;
> gd->flags = GENHD_FL_EXT_DEVT;
> - if (sdp->removable)
> + if (sdp->removable) {
> gd->flags |= GENHD_FL_REMOVABLE;
> + gd->events |= DISK_EVENT_MEDIA_CHANGE;
> + }
>
> add_disk(gd);
> sd_dif_config_host(sdkp);
> @@ -2465,7 +2467,6 @@ static int sd_probe(struct device *dev)
> sdkp->disk = gd;
> sdkp->index = index;
> atomic_set(&sdkp->openers, 0);
> - sdkp->previous_state = 1;
>
> if (!sdp->request_queue->rq_timeout) {
> if (sdp->type != TYPE_MOD)
> Index: work/drivers/scsi/sd.h
> ===================================================================
> --- work.orig/drivers/scsi/sd.h
> +++ work/drivers/scsi/sd.h
> @@ -55,7 +55,6 @@ struct scsi_disk {
> u8 media_present;
> u8 write_prot;
> u8 protection_type;/* Data Integrity Field */
> - unsigned previous_state : 1;
> unsigned ATO : 1; /* state of disk ATO bit */
> unsigned WCE : 1; /* state of disk WCE bit */
> unsigned RCD : 1; /* state of disk RCD bit, unused */
^ permalink raw reply
* Re: linux-next: Tree for December 20
From: Zimny Lech @ 2010-12-20 16:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20101220200013.df8fbc88.sfr@canb.auug.org.au>
Ave,
2010/12/20 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi all,
>
> [The mirroring on kernel.org is running slowly]
>
Looks like something is borked
Fetching linux-next
fatal: The remote end hung up unexpectedly
fatal: protocol error: bad pack header
error: Could not fetch linux-next
--
Slawa!
Zimny "Spie dziadu!" Lech z Wawelu
Hej, tam!
Wydarłem klejnot szans
http://www.youtube.com/watch?v=VXWTlYzVFUA
^ permalink raw reply
* Fwd: [PATCH] platform/x86: Fix recursive Kconfig dependency
From: Sedat Dilek @ 2010-12-20 14:50 UTC (permalink / raw)
To: linux-next
In-Reply-To: <AANLkTi=gqimS5n6J6GXcZA_W1JHZ8yHJHAKqP=dDmN0Z@mail.gmail.com>
[ Forward to linux-next ML ]
Damn, I should do what I preach (pah and top-posting)!
- Sedat -
---------- Forwarded message ----------
From: Sedat Dilek <sedat.dilek@googlemail.com>
Date: Mon, Dec 20, 2010 at 3:46 PM
Subject: Re: [PATCH] platform/x86: Fix recursive Kconfig dependency
To: Peter Hüwe <PeterHuewe@gmx.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Randy Dunlap
<randy.dunlap@oracle.com>, Corentin Chary <corentin.chary@gmail.com>,
Matthew Garrett <mjg@redhat.com>, platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, John Linville <linville@tuxdriver.com>
On Sun, Dec 19, 2010 at 8:00 PM, Peter Hüwe <PeterHuewe@gmx.de> wrote:
> Am Freitag 17 Dezember 2010, 12:30:15 schrieb Sedat Dilek:
>> On Wed, Dec 15, 2010 at 10:14 PM, Peter Hüwe <PeterHuewe@gmx.de> wrote:
>> > Am Mittwoch 15 Dezember 2010, 21:51:04 schrieb Randy Dunlap:
>> >> > Hi, another patch was posted before:
>> >> >
>> >> > http://article.gmane.org/gmane.linux.drivers.platform.x86.devel/970/ma
>> >> > tch =acpi_wmi
>> >> >Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
>> >
>> > Yeah, you're right - but as Sedat's patch is perfect (and fixes both) -
>> > so for Sedats's patch:
>> > Acked-by: Peter Huewe <peterhuewe@gmx.de>
>> >
>> > Thanks,
>> > Peter
>>
>> [ CC John Linville ]
>>
>> It's a bit disappointing to see my fix is still not in
>> platform-drivers-x86/linux-next [1] (even it's only fixing "warnings",
>> 9 days past).
>> linux-next tree is for me a very high dynamic SCM tree, I am doing
>> mostly daily builds, at weekend I am testing/pulling other trees
>> before they go into Monday's linux-next.
>> As far as I have fun with "my process"... I will continue.
>
>
>
> Added Stephen Rothwell on CC, maybe he can apply it directly to linux-next ;)
>
> Peter
>
I do not think this will happen for a "as-warning-classified" patch.
As far as I understood from a previous asking to accept a patch
through Stephen, he answered me that he is expecting that patches for
sub-trees shall be pushed by the sub-maintainer(s).
This is surely the optimal way.
There is a nice, informative interview with Stephen on topic of
linux-next [1] (working together with submaintainers etc.).
Unfortunately, it will sometimes happen that more than one people will
notice or send a patch to the same issue.
So, yeah a bit waste of time someone could think.
Thus, it is always good to check the MLs first :-).
But which MLs?
It's a pity people don't use linux-next ML for l-n releated stuff.
As a consequence, I subscribed a few hours ago to linux-next ML [2]
and will post primarily there (LKML should IMHO not be the 1st place
for such issues, but a CC is OK).
The subjects of Emails should be very clear on what type of issue.
For example, breakage(s) shoul be clearly expressed.
Also, I miss often against WTF version of linux-next ppl send patches.
Hey, hello, each l-n version has a localversion-next file, didn't see :-)?
A good subject:
"Re: linux-next: Tree for December 20 (BROKEN iwlwifi)" or
"linux-next: next-20101220 (BROKEN iwlwifi)"
That a GIT tree is compile-able is a (maybe *the*) first step to QA,
but QA is a big playground.
Hmm, I have some ideas in my big suitcase...
The wiki [1] needs partly a refresh...
An IRC-channel #linux-next would be fine...
Lemme re-think and write them down.
- Sedat -
P.S.: Personally, I have seen some patches from Randy and others which
were still not applied.
[1] http://video.linux.com/video/1048
[2] http://linux.f-seidel.de/linux-next/pmwiki/pmwiki.php?n=Linux-next.ShortSummary
^ permalink raw reply
* Re: [PATCH] misc: Make AB8500_PWM driver depend on U8500 due to PWM breakage
From: Samuel Ortiz @ 2010-12-20 13:00 UTC (permalink / raw)
To: Mark Brown
Cc: Linus Walleij, Arun Murthy, linux-next, Stephen Rothwell,
linux-kernel
In-Reply-To: <1292848091-29959-1-git-send-email-broonie@opensource.wolfsonmicro.com>
Hi Mark,
On Mon, Dec 20, 2010 at 12:28:11PM +0000, Mark Brown wrote:
> Since we don't have a PWM API every PWM driver ends up exporting its
> own version and we need to limit the platforms we try to build them on
> in order to avoid multiple definitions. As the AB8500 is normally a
> companion chip for the U8500 CPU depend on that architecture.
>
> Previously the driver was relying on the AB8500 core only being built
> on U8500 but this did not give us build coverage of any of the other
> functions for the device.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>
> Here's a better way of solving the problem,
Definitely nicer, yes. Patch applied, thanks a lot.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply
* [PATCH] misc: Make AB8500_PWM driver depend on U8500 due to PWM breakage
From: Mark Brown @ 2010-12-20 12:28 UTC (permalink / raw)
To: Samuel Ortiz, Linus Walleij, Arun Murthy
Cc: linux-next, Stephen Rothwell, linux-kernel, Mark Brown
In-Reply-To: <20101220192121.47767525.sfr@canb.auug.org.au>
Since we don't have a PWM API every PWM driver ends up exporting its
own version and we need to limit the platforms we try to build them on
in order to avoid multiple definitions. As the AB8500 is normally a
companion chip for the U8500 CPU depend on that architecture.
Previously the driver was relying on the AB8500 core only being built
on U8500 but this did not give us build coverage of any of the other
functions for the device.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
Here's a better way of solving the problem, it means we can build the
MFD and all the other functions on other platforms and still exclude the
problematic PWM driver.
drivers/misc/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 4d073f1..736004d 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -64,7 +64,7 @@ config ATMEL_PWM
config AB8500_PWM
bool "AB8500 PWM support"
- depends on AB8500_CORE
+ depends on AB8500_CORE && ARCH_U8500
select HAVE_PWM
help
This driver exports functions to enable/disble/config/free Pulse
--
1.7.1
^ permalink raw reply related
* Re: linux-next: build failure after merge of the final tree (mfd tree related)
From: Mark Brown @ 2010-12-20 12:18 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20101220105202.GA26706@rakim.wolfsonmicro.main>
On Mon, Dec 20, 2010 at 10:52:03AM +0000, Mark Brown wrote:
> On Mon, Dec 20, 2010 at 11:33:37AM +0100, Samuel Ortiz wrote:
> > Ok, I removed Mark's commit, the MFD tree should build fine now.
> > I'm keeping this one for whenever we'll have a proper pwm framework.
> It doesn't need dropping I think, the driver should just need a
> dependency on HAVE_PWM adding.
Meh, sorry, wrong way round.
^ permalink raw reply
* Re: linux-next: manual merge of the mfd tree with the ux500-core tree
From: Mark Brown @ 2010-12-20 12:12 UTC (permalink / raw)
To: Paul Mundt
Cc: Stephen Rothwell, Samuel Ortiz, linux-next, linux-kernel,
Sundar Iyer, Linus Walleij
In-Reply-To: <20101220042344.GB10050@linux-sh.org>
On Mon, Dec 20, 2010 at 01:23:44PM +0900, Paul Mundt wrote:
> On Mon, Dec 20, 2010 at 03:21:48PM +1100, Stephen Rothwell wrote:
> > -static void tc3589x_irq_dummy(unsigned int irq)
> > +static void tc3589x_irq_dummy(struct irq_data *data)
> > {
> > /* No mask/unmask at this level */
> > }
> >
> > static struct irq_chip tc3589x_irq_chip = {
> > - .name = "tc3589x",
> > - .mask = tc3589x_irq_dummy,
> > - .unmask = tc3589x_irq_dummy,
> > + .name = "tc3589x",
> > + .irq_mask = tc3589x_irq_dummy,
> > + .irq_unmask = tc3589x_irq_dummy,
> > };
> > static int tc3589x_irq_init(struct tc3589x *tc3589x)
> Is there some reason you don't just kill this off and use dummy_irq_chip?
Mainly that I didn't take the time to read through the code and figure
out if it was doing anything interesting with the struct elsewhere
which meant this was actually sensible (one of the other drivers was
doing something surprising).
^ permalink raw reply
* Re: linux-next: Tree for December 20
From: Sedat Dilek @ 2010-12-20 12:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, ftpadmin
In-Reply-To: <20101220230007.e82487b8.sfr@canb.auug.org.au>
On Mon, Dec 20, 2010 at 1:00 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi,
>
> On Mon, 20 Dec 2010 12:46:08 +0100 Sedat Dilek <sedat.dilek@googlemail.com> wrote:
>>
>> >
>> > [The mirroring on kernel.org is running slowly]
>>
>> Indeed, you know what's wrong with the mirrors?
>
> I don't know what is wrong. The mirroring just seems to be much slower
> in the last week or so. Today, it was just over three hours from when I
> uploaded linux-next until it was mirrored out.
>
> I have cc'd the admins.
>
Thanks.
>> Can you upload the diff-patch (patch-v2.6.37-rc6-next-20101220) to [1]
>> from your local-tree or place it somewhere else?
>
> I cannot upload directly to www.kernel.org, I up load to the same place
> on master.kernel.org and the mirroring system puts it on www.kernel.org.
>
I could download the diff-patch.
$ wget http://www.kernel.org/pub/linux/kernel/v2.6/next/patch-v2.6.37-rc6-next-20101220.bz2
- Sedat -
^ permalink raw reply
* Re: linux-next: manual merge of the mfd tree with the ux500-core tree
From: Samuel Ortiz @ 2010-12-20 12:05 UTC (permalink / raw)
To: Paul Mundt
Cc: Stephen Rothwell, linux-next, linux-kernel, Sundar Iyer,
Mark Brown, Linus Walleij
In-Reply-To: <20101220042344.GB10050@linux-sh.org>
On Mon, Dec 20, 2010 at 01:23:44PM +0900, Paul Mundt wrote:
> On Mon, Dec 20, 2010 at 03:21:48PM +1100, Stephen Rothwell wrote:
> > The genirq core is being converted to pass struct irq_data to irq_chip
> > operations rather than an IRQ number. Update the tc35892 driver to the
> > new APIs.
> >
> > Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > Acked-by: Rabin Vincent <rabin.vincent@stericsson.com>
> > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
>
> Sorry to hijack the thread..
>
> > diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
> > index 32291fe..dde2d858 100644
> > --- a/drivers/mfd/tc3589x.c
> > +++ b/drivers/mfd/tc3589x.c
> > @@ -170,15 +170,15 @@ again:
> > return IRQ_HANDLED;
> > }
> >
> > -static void tc3589x_irq_dummy(unsigned int irq)
> > +static void tc3589x_irq_dummy(struct irq_data *data)
> > {
> > /* No mask/unmask at this level */
> > }
> >
> > static struct irq_chip tc3589x_irq_chip = {
> > - .name = "tc3589x",
> > - .mask = tc3589x_irq_dummy,
> > - .unmask = tc3589x_irq_dummy,
> > + .name = "tc3589x",
> > + .irq_mask = tc3589x_irq_dummy,
> > + .irq_unmask = tc3589x_irq_dummy,
> > };
> >
> > static int tc3589x_irq_init(struct tc3589x *tc3589x)
>
> Is there some reason you don't just kill this off and use dummy_irq_chip?
Good point.
I removed this patch from my branch and sent a fix to LinusW so that he
carries it from his ux500-core branch.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply
* Re: linux-next: Tree for December 20
From: Stephen Rothwell @ 2010-12-20 12:00 UTC (permalink / raw)
To: sedat.dilek; +Cc: Sedat Dilek, linux-next, LKML, ftpadmin
In-Reply-To: <AANLkTi=gjHyMt=W4-+PSMzt7PN7i-_Yvmx7EE8z0z74q@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 818 bytes --]
Hi,
On Mon, 20 Dec 2010 12:46:08 +0100 Sedat Dilek <sedat.dilek@googlemail.com> wrote:
>
> >
> > [The mirroring on kernel.org is running slowly]
>
> Indeed, you know what's wrong with the mirrors?
I don't know what is wrong. The mirroring just seems to be much slower
in the last week or so. Today, it was just over three hours from when I
uploaded linux-next until it was mirrored out.
I have cc'd the admins.
> Can you upload the diff-patch (patch-v2.6.37-rc6-next-20101220) to [1]
> from your local-tree or place it somewhere else?
I cannot upload directly to www.kernel.org, I up load to the same place
on master.kernel.org and the mirroring system puts it on www.kernel.org.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for December 20
From: Sedat Dilek @ 2010-12-20 11:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
> Hi all,
>
> [The mirroring on kernel.org is running slowly]
Indeed, you know what's wrong with the mirrors?
Can you upload the diff-patch (patch-v2.6.37-rc6-next-20101220) to [1]
from your local-tree or place it somewhere else?
- Sedat -
[1] http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (mfd tree related)
From: Mark Brown @ 2010-12-20 10:52 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20101220103336.GC11095@sortiz-mobl>
On Mon, Dec 20, 2010 at 11:33:37AM +0100, Samuel Ortiz wrote:
> On Mon, Dec 20, 2010 at 07:21:21PM +1100, Stephen Rothwell wrote:
> > After merging the final tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> Ok, I removed Mark's commit, the MFD tree should build fine now.
> I'm keeping this one for whenever we'll have a proper pwm framework.
It doesn't need dropping I think, the driver should just need a
dependency on HAVE_PWM adding.
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (mfd tree related)
From: Samuel Ortiz @ 2010-12-20 10:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mark Brown
In-Reply-To: <20101220192121.47767525.sfr@canb.auug.org.au>
Hi Stephen,
On Mon, Dec 20, 2010 at 07:21:21PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
Ok, I removed Mark's commit, the MFD tree should build fine now.
I'm keeping this one for whenever we'll have a proper pwm framework.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply
* Re: linux-next: build warnings after merge of the mfd tree
From: Samuel Ortiz @ 2010-12-20 10:31 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, linux-kernel, Andres Salomon
In-Reply-To: <20101219202745.c733f7f8.randy.dunlap@oracle.com>
On Sun, Dec 19, 2010 at 08:27:45PM -0800, Randy Dunlap wrote:
> On Mon, 20 Dec 2010 15:25:05 +1100 Stephen Rothwell wrote:
>
> > Hi Samuel,
> >
> > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> > produced these warnings:
> >
> > drivers/gpio/cs5535-gpio.c: In function 'cs5535_gpio_probe':
> > drivers/gpio/cs5535-gpio.c:269: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'resource_size_t'
> > drivers/gpio/cs5535-gpio.c:269: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'resource_size_t'
> > drivers/misc/cs5535-mfgpt.c: In function 'cs5535_mfgpt_probe':
> > drivers/misc/cs5535-mfgpt.c:320: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'resource_size_t'
> > drivers/misc/cs5535-mfgpt.c:320: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'resource_size_t'
> >
> > Introduced by commits d8fefd6ff3a8444ab34f6eb6c7c1961f0ca0008a ("gpio:
> > Convert cs5535 from pci device to platform device") and
> > 6a85d28cfca9663c0db297a04ca43777dc5bcaa6 ("misc: Convert cs5535-mfgpt
> > from pci device to platform device"). We have %pR for printing
> > resources ...
>
> Yes, and Joe Perches has posted a patch for that.
I never received that one. I found it on patchwork, and applied it now.
Stephen, this is fixed.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply
* linux-next: Tree for December 20
From: Stephen Rothwell @ 2010-12-20 9:00 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10349 bytes --]
Hi all,
[The mirroring on kernel.org is running slowly]
Changes since 20101217:
The arm tree lost its conflict.
The rmobile tree gained a conflict against the rmobile-current tree.
The pci tree gained a conflict against Linus' tree.
The net tree lost 4 conflicts.
The mfd tree gained a conflict against the ux500-core tree and a build
failure for which I reverted a commit.
The percpu tree lost its conflict.
The tty tree still has its build failure so I reverted a commit.
The usb tree gained a conflict against the usb.current tree.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 183 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/rc-fixes
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/timer.c
Merging ux500-core/ux500-core
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/entry-macro.S
Applying: rmobile: merge fixup for clkdev changes
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
CONFLICT (content): Merge conflict in fs/cifs/dir.c
CONFLICT (content): Merge conflict in fs/fuse/inode.c
CONFLICT (content): Merge conflict in fs/hfsplus/hfsplus_fs.h
CONFLICT (content): Merge conflict in fs/hfsplus/unicode.c
Merging pci/linux-next
CONFLICT (add/add): Merge conflict in arch/x86/kernel/resource.c
CONFLICT (content): Merge conflict in arch/x86/pci/i386.c
CONFLICT (content): Merge conflict in kernel/resource.c
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-1000.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-6000.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/Makefile
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
CONFLICT (content): Merge conflict in include/linux/input.h
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in drivers/scsi/sd.c
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (delete/modify): drivers/mfd/tc35892.c deleted in HEAD and modified in mfd/for-next. Version mfd/for-next of drivers/mfd/tc35892.c left in tree.
CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c
$ git rm -f drivers/mfd/tc35892.c
Applying: mfd: Convert tc35892 to new irq_ APIs
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/core.c
CONFLICT (content): Merge conflict in drivers/regulator/mc13783-regulator.c
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/pm24xx.c
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
Merging swiotlb-xen/master
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
CONFLICT (content): Merge conflict in drivers/xen/Makefile
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
[master f28cfe5] Revert "drivers: serial: apbuart: Handle OF failures gracefully"
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/sh/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/gadget/composite.c
Merging staging/staging-next
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c
CONFLICT (content): Merge conflict in include/linux/hardirq.h
CONFLICT (content): Merge conflict in include/linux/smp_lock.h
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/super.c
CONFLICT (content): Merge conflict in fs/super.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
[master c7dc3ea] Revert "mfd: Remove ARCH_U8500 dependency from AB8500"
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for December 17 (kvm)
From: Avi Kivity @ 2010-12-20 8:54 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, kvm, linux-next, LKML
In-Reply-To: <20101217111052.8bba9060.randy.dunlap@oracle.com>
On 12/17/2010 09:10 PM, Randy Dunlap wrote:
> On Fri, 17 Dec 2010 17:32:37 +1100 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > [The mirroring on kernel.org is running slowly]
> >
> > Changes since 20101216:
>
>
> on i386 builds, I'm seeing this build error:
>
> arch/x86/kvm/vmx.c:488: Error:bad register name `%sil'
>
> but I don't see what is causing it...
>
"=g" needs to be "=qQm" in vmcs_load(). I'll post a patch.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply
* linux-next: build failure after merge of the final tree (mfd tree related)
From: Stephen Rothwell @ 2010-12-20 8:21 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: linux-next, linux-kernel, Mark Brown
[-- Attachment #1: Type: text/plain, Size: 2766 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/mfd/built-in.o: In function `__crc_pwm_free':
(*ABS*+0x24ba6d1e): multiple definition of `__crc_pwm_free'
drivers/mfd/built-in.o: In function `.pwm_free':
(.text+0x1a2bc): multiple definition of `.pwm_free'
drivers/misc/built-in.o:(.text+0x32e40): first defined here
drivers/mfd/built-in.o: In function `__crc_pwm_request':
(*ABS*+0xc1f4ec93): multiple definition of `__crc_pwm_request'
drivers/mfd/built-in.o: In function `__crc_pwm_enable':
(*ABS*+0x9d09808d): multiple definition of `__crc_pwm_enable'
drivers/mfd/built-in.o: In function `.pwm_enable':
(.text+0x1a348): multiple definition of `.pwm_enable'
drivers/misc/built-in.o:(.text+0x32eac): first defined here
drivers/mfd/built-in.o: In function `.pwm_request':
(.text+0x19ff4): multiple definition of `.pwm_request'
drivers/misc/built-in.o:(.text+0x32c80): first defined here
drivers/mfd/built-in.o: In function `pwm_config':
(.opd+0x1e48): multiple definition of `pwm_config'
drivers/misc/built-in.o:(.opd+0x4158): first defined here
drivers/mfd/built-in.o: In function `pwm_free':
(.opd+0x1e90): multiple definition of `pwm_free'
drivers/misc/built-in.o:(.opd+0x4128): first defined here
drivers/mfd/built-in.o: In function `pwm_request':
(.opd+0x1e60): multiple definition of `pwm_request'
drivers/misc/built-in.o:(.opd+0x40b0): first defined here
drivers/mfd/built-in.o: In function `__crc_pwm_disable':
(*ABS*+0xb0493b18): multiple definition of `__crc_pwm_disable'
drivers/mfd/built-in.o: In function `.pwm_disable':
(.text+0x1a1a4): multiple definition of `.pwm_disable'
drivers/misc/built-in.o:(.text+0x32d70): first defined here
drivers/mfd/built-in.o: In function `pwm_enable':
(.opd+0x1ea8): multiple definition of `pwm_enable'
drivers/misc/built-in.o:(.opd+0x4140): first defined here
drivers/mfd/built-in.o: In function `.pwm_config':
(.text+0x19ec8): multiple definition of `.pwm_config'
drivers/misc/built-in.o:(.text+0x32f8c): first defined here
drivers/mfd/built-in.o: In function `pwm_disable':
(.opd+0x1e78): multiple definition of `pwm_disable'
drivers/misc/built-in.o:(.opd+0x4110): first defined here
drivers/mfd/built-in.o: In function `__crc_pwm_config':
(*ABS*+0xc23f5b9): multiple definition of `__crc_pwm_config'
Probably caused by commit 665ba7cafa19e2e2596ace30edc75ebec882e82d ("mfd:
Remove ARCH_U8500 dependency from AB8500") which allowed this driver to
be built in on PowerPC ...
Some of the above symbols are global in more than one place in our code ...
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build warning after merge of the block tree
From: Jens Axboe @ 2010-12-20 8:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Michał Mirosław
In-Reply-To: <20101220154259.9a84819e.sfr@canb.auug.org.au>
On 2010-12-20 05:42, Stephen Rothwell wrote:
> Hi Jens,
>
> On Mon, 20 Dec 2010 15:31:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the block tree, today's linux-next build (powerpc
>> ppc64_defconfig) produced this warning:
>>
>> drivers/block/loop.c: In function 'lo_splice_actor':
>> drivers/block/loop.c:398: warning: unused variable 'ret'
>>
>> Introduced by commit a8adbe378b56acd5945df70753c7e8f6fe223304
>> ("fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors").
>
> Also:
>
> fs/nfsd/vfs.c: In function 'nfsd_splice_actor':
> fs/nfsd/vfs.c:848: warning: unused variable 'ret'
Hrmpf, that's not very nice. I'll add a fixup patch, thanks Stephen.
--
Jens Axboe
^ permalink raw reply
* linux-next: manual merge of the usb tree with the usb.current tree
From: Stephen Rothwell @ 2010-12-20 5:28 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Marek Belisko
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/composite.c between commit
dbb442b85a1d82f91cfe0524c4f9b3a5196a10ca ("Revert "USB: gadget: Allow
function access to device ID data during bind()"") from the usb.current
tree and commit 78bff3c65df33da47e93736bd8847b694084e5a9 ("USB: gadget:
composite: Typo fix") from the usb tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/gadget/composite.c
index 8572dad,21dc0da..0000000
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@@ -1118,15 -1126,7 +1118,15 @@@ static int composite_bind(struct usb_ga
cdev->desc = *composite->dev;
cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
+ /* standardized runtime overrides for device ID data */
+ if (idVendor)
+ cdev->desc.idVendor = cpu_to_le16(idVendor);
+ if (idProduct)
+ cdev->desc.idProduct = cpu_to_le16(idProduct);
+ if (bcdDevice)
+ cdev->desc.bcdDevice = cpu_to_le16(bcdDevice);
+
- /* stirng overrides */
+ /* string overrides */
if (iManufacturer || !cdev->desc.iManufacturer) {
if (!iManufacturer && !composite->iManufacturer &&
!*composite_manufacturer)
^ permalink raw reply
* Re: linux-next: build warning after merge of the block tree
From: Stephen Rothwell @ 2010-12-20 4:42 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, "Michał Mirosław"
In-Reply-To: <20101220153127.ad8213b2.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 690 bytes --]
Hi Jens,
On Mon, 20 Dec 2010 15:31:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
>
> drivers/block/loop.c: In function 'lo_splice_actor':
> drivers/block/loop.c:398: warning: unused variable 'ret'
>
> Introduced by commit a8adbe378b56acd5945df70753c7e8f6fe223304
> ("fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors").
Also:
fs/nfsd/vfs.c: In function 'nfsd_splice_actor':
fs/nfsd/vfs.c:848: warning: unused variable 'ret'
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build warning after merge of the block tree
From: Stephen Rothwell @ 2010-12-20 4:31 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, "Michał Mirosław"
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
Hi Jens,
After merging the block tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:
drivers/block/loop.c: In function 'lo_splice_actor':
drivers/block/loop.c:398: warning: unused variable 'ret'
Introduced by commit a8adbe378b56acd5945df70753c7e8f6fe223304
("fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build warnings after merge of the mfd tree
From: Randy Dunlap @ 2010-12-20 4:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Samuel Ortiz, linux-next, linux-kernel, Andres Salomon
In-Reply-To: <20101220152505.f9974119.sfr@canb.auug.org.au>
On Mon, 20 Dec 2010 15:25:05 +1100 Stephen Rothwell wrote:
> Hi Samuel,
>
> After merging the mfd tree, today's linux-next build (x86_64 allmodconfig)
> produced these warnings:
>
> drivers/gpio/cs5535-gpio.c: In function 'cs5535_gpio_probe':
> drivers/gpio/cs5535-gpio.c:269: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'resource_size_t'
> drivers/gpio/cs5535-gpio.c:269: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'resource_size_t'
> drivers/misc/cs5535-mfgpt.c: In function 'cs5535_mfgpt_probe':
> drivers/misc/cs5535-mfgpt.c:320: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'resource_size_t'
> drivers/misc/cs5535-mfgpt.c:320: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'resource_size_t'
>
> Introduced by commits d8fefd6ff3a8444ab34f6eb6c7c1961f0ca0008a ("gpio:
> Convert cs5535 from pci device to platform device") and
> 6a85d28cfca9663c0db297a04ca43777dc5bcaa6 ("misc: Convert cs5535-mfgpt
> from pci device to platform device"). We have %pR for printing
> resources ...
Yes, and Joe Perches has posted a patch for that.
It just needs to be merged....
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
desserts: http://www.xenotime.net/linux/recipes/
^ permalink raw reply
* Re: linux-next: manual merge of the mfd tree with the ux500-core tree
From: Paul Mundt @ 2010-12-20 4:23 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Samuel Ortiz, linux-next, linux-kernel, Sundar Iyer, Mark Brown,
Linus Walleij
In-Reply-To: <20101220152148.6fedee0d.sfr@canb.auug.org.au>
On Mon, Dec 20, 2010 at 03:21:48PM +1100, Stephen Rothwell wrote:
> The genirq core is being converted to pass struct irq_data to irq_chip
> operations rather than an IRQ number. Update the tc35892 driver to the
> new APIs.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Acked-by: Rabin Vincent <rabin.vincent@stericsson.com>
> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Sorry to hijack the thread..
> diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
> index 32291fe..dde2d858 100644
> --- a/drivers/mfd/tc3589x.c
> +++ b/drivers/mfd/tc3589x.c
> @@ -170,15 +170,15 @@ again:
> return IRQ_HANDLED;
> }
>
> -static void tc3589x_irq_dummy(unsigned int irq)
> +static void tc3589x_irq_dummy(struct irq_data *data)
> {
> /* No mask/unmask at this level */
> }
>
> static struct irq_chip tc3589x_irq_chip = {
> - .name = "tc3589x",
> - .mask = tc3589x_irq_dummy,
> - .unmask = tc3589x_irq_dummy,
> + .name = "tc3589x",
> + .irq_mask = tc3589x_irq_dummy,
> + .irq_unmask = tc3589x_irq_dummy,
> };
>
> static int tc3589x_irq_init(struct tc3589x *tc3589x)
Is there some reason you don't just kill this off and use dummy_irq_chip?
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox