* Re: [PATCH] Remove unused variables from the cirrusfb driver
From: Richard Holden @ 2008-11-21 6:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20081121103409.fed9a837.sfr@canb.auug.org.au>
On Nov 20, 2008, at 4:34 PM, Stephen Rothwell wrote:
> Hi Richard,
>
> On Thu, 20 Nov 2008 11:03:22 -0700 "Richard A. Holden III" <aciddeath@gmail.com
> > wrote:
>>
>> Remove i and s vars from cirrusfb_setup as they are not used
>> anywhere in that function. This fixes 2 unused vars build warnings.
>
> Thanks for the patch, but this is already fixed in mainline (commit
> ee11940f8e7a2f064af22d52180cb5f9643eef61 "cirrusfb: remove unused
> variables").
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
Am I right in assuming you pulled mainline before this commit for
next-20081120? I don't see the changelog in next and I'm getting the
build warnings still, but I can recheck this in the next version of
next.
-Richard Holden
^ permalink raw reply
* Re: linux-next: manual merge of the net tree
From: Stephen Rothwell @ 2008-11-21 4:22 UTC (permalink / raw)
To: David Miller
Cc: linux-next, jesse.brandeburg, jgarzik, jeffrey.t.kirsher,
adobriyan
In-Reply-To: <20081120.201102.250443248.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
Hi Dave,
On Thu, 20 Nov 2008 20:11:02 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> If you would have pulled 20 minutes later you would have gotten
> my tree after sorting out these merge hassles :)
I will start sleeping in :-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: net tree build failure
From: David Miller @ 2008-11-21 4:13 UTC (permalink / raw)
To: shemminger; +Cc: sfr, linux-next
In-Reply-To: <20081120200226.6dc2b209@extreme>
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 20 Nov 2008 20:02:26 -0800
> On Fri, 21 Nov 2008 13:44:57 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi Dave,
> >
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:
> >
> > drivers/net/acenic.c:461: error: 'ace_vlan_rx_register' undeclared here (not in a function)
> >
> > Caused by commit d8b83c57a7e497cba9b5cb156e63176323035785 ("acenic:
> > convert to net_device_ops"). This commit should also be looked at
> > again as ace_vlan_rx_register() is only defined if ACENIC_DO_VLAN is
> > set but it is used in net_device_ops unconditionally. And it needs to
> > be forward declared to get rid of the compiler error above, of course.
> >
> > I have dropped the net tree for today.
>
> Fixed by later patch (in second wave)
Yep, I'll take care of this tonight.
^ permalink raw reply
* Re: linux-next: manual merge of the net tree
From: David Miller @ 2008-11-21 4:11 UTC (permalink / raw)
To: sfr; +Cc: linux-next, jesse.brandeburg, jgarzik, jeffrey.t.kirsher,
adobriyan
In-Reply-To: <20081121132941.87c9eacc.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 21 Nov 2008 13:29:41 +1100
> Hi Dave,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/ixgbe/ixgbe_main.c between commit
> 79aefa45b20940cbb9104464548ff74f80f2395e ("ixgbe: fix compilation with
> gcc-3.4") from the net-current tree and commit
> 0befdb3e0a26a8949063915274e1bec8873c526b ("ixgbe: add device support for
> 82598AT (copper 10GbE) adapters") from the net tree.
>
> I fixed it up (see below) and assume you will do something similar.
If you would have pulled 20 minutes later you would have gotten
my tree after sorting out these merge hassles :)
^ permalink raw reply
* Re: linux-next: net tree build failure
From: Stephen Hemminger @ 2008-11-21 4:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, linux-next
In-Reply-To: <20081121134457.85e1d384.sfr@canb.auug.org.au>
On Fri, 21 Nov 2008 13:44:57 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dave,
>
> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>
> drivers/net/acenic.c:461: error: 'ace_vlan_rx_register' undeclared here (not in a function)
>
> Caused by commit d8b83c57a7e497cba9b5cb156e63176323035785 ("acenic:
> convert to net_device_ops"). This commit should also be looked at
> again as ace_vlan_rx_register() is only defined if ACENIC_DO_VLAN is
> set but it is used in net_device_ops unconditionally. And it needs to
> be forward declared to get rid of the compiler error above, of course.
>
> I have dropped the net tree for today.
Fixed by later patch (in second wave)
^ permalink raw reply
* linux-next: rr tree build failure
From: Stephen Rothwell @ 2008-11-21 3:19 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
Hi Rusty,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
drivers/usb/core/usb.c:958:76: error: macro "__module_param_call" requires 7 arguments, but only 6 given
Caused by commit 636c06e04b23e9dabf709c496cb9a28459f63eaa
("param:core_param-really-really-early").
I have dropped the rr tree again.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: net tree build failure
From: Stephen Rothwell @ 2008-11-21 2:44 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Stephen Hemminger
[-- Attachment #1: Type: text/plain, Size: 680 bytes --]
Hi Dave,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
drivers/net/acenic.c:461: error: 'ace_vlan_rx_register' undeclared here (not in a function)
Caused by commit d8b83c57a7e497cba9b5cb156e63176323035785 ("acenic:
convert to net_device_ops"). This commit should also be looked at
again as ace_vlan_rx_register() is only defined if ACENIC_DO_VLAN is
set but it is used in net_device_ops unconditionally. And it needs to
be forward declared to get rid of the compiler error above, of course.
I have dropped the net tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the net tree
From: Stephen Rothwell @ 2008-11-21 2:33 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Harvey Harrison, Alexey Dobriyan
[-- Attachment #1: Type: text/plain, Size: 587 bytes --]
Hi Dave,
Today's linux-next merge of the net tree got a conflict in
net/phonet/af_phonet.c between commit
566521d63720ab47576afb85147e5652993bf1e6 ("phonet: fix compilation with
gcc-3.4") from the net-current tree and commit
5c7f0333584128c745fbda845abbe3a32c22d467 ("phonet: sparse annotations of
protocol, remove forward declaration") from the net tree.
I fixed it up (by adding the extra bits from the net-current change) and
assume you will do something similar.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the net tree
From: Stephen Rothwell @ 2008-11-21 2:29 UTC (permalink / raw)
To: David Miller
Cc: linux-next, Jesse Brandeburg, Jeff Garzik, Jeff Kirsher,
Alexey Dobriyan
Hi Dave,
Today's linux-next merge of the net tree got a conflict in
drivers/net/ixgbe/ixgbe_main.c between commit
79aefa45b20940cbb9104464548ff74f80f2395e ("ixgbe: fix compilation with
gcc-3.4") from the net-current tree and commit
0befdb3e0a26a8949063915274e1bec8873c526b ("ixgbe: add device support for
82598AT (copper 10GbE) adapters") from the net tree.
I fixed it up (see below) and assume you will do something similar.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/net/ixgbe/ixgbe_main.c
index 36f2bb6,6fb8738..0000000
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@@ -1287,34 -1301,7 +1301,36 @@@ static void ixgbe_set_itr(struct ixgbe_
return;
}
-static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter);
+/**
+ * ixgbe_irq_disable - Mask off interrupt generation on the NIC
+ * @adapter: board private structure
+ **/
+static inline void ixgbe_irq_disable(struct ixgbe_adapter *adapter)
+{
+ IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, ~0);
+ IXGBE_WRITE_FLUSH(&adapter->hw);
+ if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+ int i;
+ for (i = 0; i < adapter->num_msix_vectors; i++)
+ synchronize_irq(adapter->msix_entries[i].vector);
+ } else {
+ synchronize_irq(adapter->pdev->irq);
+ }
+}
+
+/**
+ * ixgbe_irq_enable - Enable default interrupt generation settings
+ * @adapter: board private structure
+ **/
+static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter)
+{
+ u32 mask;
+ mask = IXGBE_EIMS_ENABLE_MASK;
++ if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE)
++ mask |= IXGBE_EIMS_GPI_SDP1;
+ IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMS, mask);
+ IXGBE_WRITE_FLUSH(&adapter->hw);
+}
/**
* ixgbe_intr - legacy mode Interrupt Handler
^ permalink raw reply
* Re: [PATCH] Remove unused variables from the cirrusfb driver
From: Stephen Rothwell @ 2008-11-20 23:34 UTC (permalink / raw)
To: Richard A. Holden III; +Cc: linux-next, linux-kernel
In-Reply-To: <1227204203-32112-2-git-send-email-aciddeath@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
Hi Richard,
On Thu, 20 Nov 2008 11:03:22 -0700 "Richard A. Holden III" <aciddeath@gmail.com> wrote:
>
> Remove i and s vars from cirrusfb_setup as they are not used
> anywhere in that function. This fixes 2 unused vars build warnings.
Thanks for the patch, but this is already fixed in mainline (commit
ee11940f8e7a2f064af22d52180cb5f9643eef61 "cirrusfb: remove unused
variables").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for November 20 (staging* [lots])
From: Randy Dunlap @ 2008-11-20 20:52 UTC (permalink / raw)
To: Stephen Rothwell, gregkh; +Cc: linux-next, LKML
In-Reply-To: <20081120212907.efc2276b.sfr@canb.auug.org.au>
On Thu, 20 Nov 2008 21:29:07 +1100 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20081119:
>
> Undropped trees:
> driver-core
> usb
> staging
drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:328: error: 'struct ieee80211_if_conf' has no member named 'ssid'
drivers/staging/agnx/pci.c:328: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:329: error: 'struct ieee80211_if_conf' has no member named 'ssid'
drivers/staging/agnx/pci.c:329: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:330: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid'
drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid'
drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
(r6260 & r6298 & r6300)
drivers/staging/rt2860/rt_profile.c:928: error: 'struct task_struct' has no member named 'fsuid'
drivers/staging/rt2860/rt_profile.c:929: error: 'struct task_struct' has no member named 'fsgid'
drivers/staging/rt2860/rt_profile.c:930: error: 'struct task_struct' has no member named 'fsuid'
drivers/staging/rt2860/rt_profile.c:930: error: 'struct task_struct' has no member named 'fsgid'
drivers/staging/rt2860/rt_profile.c:1554: error: 'struct task_struct' has no member named 'fsuid'
drivers/staging/rt2860/rt_profile.c:1555: error: 'struct task_struct' has no member named 'fsgid'
(r6265)
(.text+0x5e0): multiple definition of `comedi_unmap'
(r6272 & r6297 & r6259)
asus_oled.c:(.text+0x164fb4): undefined reference to `usb_bulk_msg'
asus_oled.c:(.text+0x16508d): undefined reference to `usb_bulk_msg'
asus_oled.c:(.text+0x1651ef): undefined reference to `usb_put_dev'
asus_oled.c:(.text+0x1652f3): undefined reference to `usb_bulk_msg'
asus_oled.c:(.text+0x1654eb): undefined reference to `usb_get_dev'
asus_oled.c:(.text+0x1655b0): undefined reference to `usb_put_dev'
asus_oled.c:(.init.text+0xcb01): undefined reference to `usb_register_driver'
asus_oled.c:(.exit.text+0x1acb): undefined reference to `usb_deregister'
(r6261)
drivers/staging/meilhaus/me0600_device.o: WARNING: referencing weak function me0600_pci_constructor for mcount
drivers/staging/meilhaus/me0900_device.o: WARNING: referencing weak function me0900_pci_constructor for mcount
drivers/staging/meilhaus/me1400_device.o: WARNING: referencing weak function me1400_pci_constructor for mcount
drivers/staging/meilhaus/me4600_device.o: WARNING: referencing weak function me4600_pci_constructor for mcount
drivers/staging/meilhaus/me6000_device.o: WARNING: referencing weak function me6000_pci_constructor for mcount
drivers/staging/meilhaus/me8100_device.o: WARNING: referencing weak function me8100_pci_constructor for mcount
(r6263)
drivers/staging/comedi/proc.c:89: error: redefinition of 'comedi_proc_init'
drivers/staging/comedi/comedidev.h:368: error: previous definition of 'comedi_proc_init' was here
drivers/staging/comedi/proc.c:98: error: redefinition of 'comedi_proc_cleanup'
drivers/staging/comedi/comedidev.h:371: error: previous definition of 'comedi_proc_cleanup' was here
(r6287)
(.init.text+0x0): multiple definition of `init_module'
(.text+0x1d1d): multiple definition of `me_dlock_lock'
(.text+0x1c5b): multiple definition of `me_dlist_deinit'
(.text+0x1ca4): multiple definition of `me_dlist_get_device'
(.exit.text+0x0): multiple definition of `cleanup_module'
(.text+0x20fc): multiple definition of `me_slist_add_subdevice_tail'
(.text+0x2123): multiple definition of `me_slist_deinit'
(.text+0x1ebc): multiple definition of `me_dlock_enter'
(.text+0x226c): multiple definition of `me_slock_deinit'
(.text+0x22f4): multiple definition of `me_slock_lock'
(.init.text+0x0): multiple definition of `init_module'
(.text+0x20f0): multiple definition of `me_slist_query_number_subdevices'
(.text+0x2112): multiple definition of `me_slist_init'
(.text+0x1d04): multiple definition of `me_dlock_deinit'
(.text+0x1fb6): multiple definition of `me_subdevice_deinit'
(.text+0x1c4a): multiple definition of `me_dlist_init'
(.text+0x220a): multiple definition of `me_slist_get_subdevice'
(.text+0x226d): multiple definition of `me_slock_init'
(.text+0x1c34): multiple definition of `me_dlist_add_device_tail'
(.text+0x222f): multiple definition of `me_slist_del_subdevice_tail'
(.text+0x1c30): multiple definition of `me_dlist_get_number_devices'
(.text+0x2285): multiple definition of `me_slock_enter'
(.text+0x1c28): multiple definition of `me_dlist_query_number_devices'
(.text+0x1cc9): multiple definition of `me_dlist_del_device_tail'
(.text+0x1fbf): multiple definition of `me_subdevice_init'
(.text+0x20f8): multiple definition of `me_slist_get_number_subdevices'
(.text+0x86): multiple definition of `me_device_deinit'
(.text+0x1f04): multiple definition of `me_dlock_exit'
(.text+0xbd): multiple definition of `me_device_pci_init'
(.text+0x216c): multiple definition of `me_slist_get_subdevice_by_type'
(.text+0x1d05): multiple definition of `me_dlock_init'
(.text+0x22cd): multiple definition of `me_slock_exit'
(.text+0x1d1d): multiple definition of `me_dlock_lock'
(.text+0x1c5b): multiple definition of `me_dlist_deinit'
(.text+0x1ca4): multiple definition of `me_dlist_get_device'
(.exit.text+0x0): multiple definition of `cleanup_module'
(.text+0x20fc): multiple definition of `me_slist_add_subdevice_tail'
(.text+0x2123): multiple definition of `me_slist_deinit'
(.text+0x1ebc): multiple definition of `me_dlock_enter'
(.text+0x226c): multiple definition of `me_slock_deinit'
(.text+0x22f4): multiple definition of `me_slock_lock'
(.init.text+0x0): multiple definition of `init_module'
(.text+0x20f0): multiple definition of `me_slist_query_number_subdevices'
(.text+0x2112): multiple definition of `me_slist_init'
(.text+0x1d04): multiple definition of `me_dlock_deinit'
(.text+0x1fb6): multiple definition of `me_subdevice_deinit'
(.text+0x1c4a): multiple definition of `me_dlist_init'
(.text+0x220a): multiple definition of `me_slist_get_subdevice'
(.text+0x226d): multiple definition of `me_slock_init'
(.text+0x1c34): multiple definition of `me_dlist_add_device_tail'
(.text+0x222f): multiple definition of `me_slist_del_subdevice_tail'
(.text+0x1c30): multiple definition of `me_dlist_get_number_devices'
(.text+0x2285): multiple definition of `me_slock_enter'
(.text+0x1c28): multiple definition of `me_dlist_query_number_devices'
(.text+0x1cc9): multiple definition of `me_dlist_del_device_tail'
(.text+0x1fbf): multiple definition of `me_subdevice_init'
(.text+0x20f8): multiple definition of `me_slist_get_number_subdevices'
(.text+0x86): multiple definition of `me_device_deinit'
(.text+0x1f04): multiple definition of `me_dlock_exit'
(.text+0xbd): multiple definition of `me_device_pci_init'
(.text+0x216c): multiple definition of `me_slist_get_subdevice_by_type'
(.text+0x1d05): multiple definition of `me_dlock_init'
(.text+0x22cd): multiple definition of `me_slock_exit'
make[4]: *** [drivers/staging/meilhaus/built-in.o] Error 1
(r6291)
Let me know if/which .config files are needed.
---
~Randy
^ permalink raw reply
* Re: [PATCH] Remove unused variable from tlv320aic23 codec
From: Mark Brown @ 2008-11-20 18:56 UTC (permalink / raw)
To: Richard A. Holden III
Cc: alsa-devel, Takashi Iwai, linux-kernel, linux-next, Liam Girdwood
In-Reply-To: <1227204203-32112-3-git-send-email-aciddeath@gmail.com>
On Thu, Nov 20, 2008 at 11:03:23AM -0700, Richard A. Holden III wrote:
> Remove codec var from tlv320aic23_set_dai_sysclk, it is assigned to
> but never read.
This does not apply - it looks like you've generated it against code
from before commit 26df91c3 (ASoC: TLV320AIC23B Support more sample
rates) from 5th November which rewrote all this code.
^ permalink raw reply
* Re: linux-next-20081120 - staging - asus_oled device build fails with !CONFIG_USB_SUPPORT
From: Kamalesh Babulal @ 2008-11-20 17:09 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, gregkh, sjakub
In-Reply-To: <20081120212907.efc2276b.sfr@canb.auug.org.au>
Hi Stephen,
next-2001120 kernel randconfig build fails with build failure
drivers/built-in.o: In function `enable_oled':
asus_oled.c:(.text+0x170d26): undefined reference to `usb_bulk_msg'
drivers/built-in.o: In function `send_packet':
asus_oled.c:(.text+0x170e5e): undefined reference to `usb_bulk_msg'
drivers/built-in.o: In function `send_packets':
asus_oled.c:(.text+0x170fd4): undefined reference to `usb_bulk_msg'
drivers/built-in.o: In function `asus_oled_disconnect':
asus_oled.c:(.text+0x171761): undefined reference to `usb_put_dev'
drivers/built-in.o: In function `asus_oled_probe':
asus_oled.c:(.text+0x17189f): undefined reference to `usb_get_dev'
asus_oled.c:(.text+0x171a4c): undefined reference to `usb_put_dev'
drivers/built-in.o: In function `asus_oled_init':
asus_oled.c:(.init.text+0xdabe): undefined reference to `usb_register_driver'
drivers/built-in.o: In function `asus_oled_exit':
asus_oled.c:(.exit.text+0x2281): undefined reference to `usb_deregister'
asus_oled depends on the CONFIG_USB_SUPPORT, I have only build tested
the patch.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
---
--- linux/drivers/staging/asus_oled/Kconfig 2008-11-20 11:50:43.000000000 -0500
+++ linux/drivers/staging/asus_oled/~Kconfig 2008-11-20 11:50:35.000000000 -0500
@@ -1,5 +1,6 @@
config ASUS_OLED
tristate "Asus OLED driver"
+ depends on USB_SUPPORT
default N
---help---
Enable support for the OLED display present in some Asus laptops.
--
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.
^ permalink raw reply
* [PATCH] Remove unused variable from tlv320aic23 codec
From: Richard A. Holden III @ 2008-11-20 18:03 UTC (permalink / raw)
To: linux-next
Cc: linux-kernel, Jaroslav Kysela, Takashi Iwai, Liam Girdwood,
Mark Brown, alsa-devel
In-Reply-To: <1227204203-32112-2-git-send-email-aciddeath@gmail.com>
Remove codec var from tlv320aic23_set_dai_sysclk, it is assigned to
but never read.
Signed-off-by: Richard A. Holden III <aciddeath@gmail.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org
---
sound/soc/codecs/tlv320aic23.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index 44308da..45395d0 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -421,8 +421,6 @@ static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai,
static int tlv320aic23_set_dai_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir)
{
- struct snd_soc_codec *codec = codec_dai->codec;
-
switch (freq) {
case 12000000:
return 0;
--
1.5.6.4
^ permalink raw reply related
* [PATCH] Remove unused variables from the cirrusfb driver
From: Richard A. Holden III @ 2008-11-20 18:03 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
In-Reply-To: <1227204203-32112-1-git-send-email-aciddeath@gmail.com>
Remove i and s vars from cirrusfb_setup as they are not used
anywhere in that function. This fixes 2 unused vars build warnings.
Signed-off-by: Richard A. Holden III <aciddeath@gmail.com>
---
drivers/video/cirrusfb.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 8a87602..a2aa6dd 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -2462,8 +2462,7 @@ static int __init cirrusfb_init(void)
#ifndef MODULE
static int __init cirrusfb_setup(char *options) {
- char *this_opt, s[32];
- int i;
+ char *this_opt;
DPRINTK("ENTER\n");
--
1.5.6.4
^ permalink raw reply related
* [PATCH] Fix arch/x86/kernel/cpu/mtrr/main.c build warning
From: Richard A. Holden III @ 2008-11-20 18:03 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Fix
arch/x86/kernel/cpu/mtrr/main.c: In function 'mtrr_bp_init':
arch/x86/kernel/cpu/mtrr/main.c:1364: warning: 'gran_base' may be used uninitialized in this function
gran_base is only used within the if (debug_print) sections of the for loop, so combine both sections
and move the declaration to within if (debug_print). The overhead of to_size_factor may be a consideration
but the compiler should be able to optimize out the multiple calls.
Signed-off-by: Richard A. Holden III <aciddeath@gmail.com>
---
arch/x86/kernel/cpu/mtrr/main.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index c091d06..b751e3a 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -1360,20 +1360,16 @@ static int __init mtrr_cleanup(unsigned address_bits)
memset(min_loss_pfn, 0xff, sizeof(min_loss_pfn));
memset(result, 0, sizeof(result));
for (gran_size = (1ULL<<16); gran_size < (1ULL<<32); gran_size <<= 1) {
- char gran_factor;
- unsigned long gran_base;
-
- if (debug_print)
- gran_base = to_size_factor(gran_size >> 10, &gran_factor);
for (chunk_size = gran_size; chunk_size < (1ULL<<32);
chunk_size <<= 1) {
int num_reg;
if (debug_print) {
- char chunk_factor;
- unsigned long chunk_base;
+ char gran_factor, chunk_factor;
+ unsigned long gran_base, chunk_base;
+ gran_base = to_size_factor(gran_size >> 10, &gran_factor);
chunk_base = to_size_factor(chunk_size>>10, &chunk_factor),
printk(KERN_INFO "\n");
printk(KERN_INFO "gran_size: %ld%c chunk_size: %ld%c \n",
--
1.5.6.4
^ permalink raw reply related
* Re: linux-next-20081120 - staging - meilhaus driver build fails
From: Kamalesh Babulal @ 2008-11-20 16:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, gregkh, k.gantzke
In-Reply-To: <20081120212907.efc2276b.sfr@canb.auug.org.au>
Hi Stephen,
next-20081120 kernel randconfig on x86_64 box fails, while !CONFIG_MODULES
drivers/staging/meilhaus/memain.c: In function 'me_probe_pci':
drivers/staging/meilhaus/memain.c:425: error: implicit declaration of function '__symbol_get'
drivers/staging/meilhaus/memain.c:425: warning: cast to pointer from integer of different size
drivers/staging/meilhaus/memain.c:433: warning: cast to pointer from integer of different size
drivers/staging/meilhaus/memain.c:453: error: implicit declaration of function '__symbol_put'
make[3]: *** [drivers/staging/meilhaus/memain.o] Error 1
the driver uses __symbol_get and __symbol_put instead of marco's symbol_get and symbol_put,
I have only build tested the patch.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
---
--- linux/drivers/staging/meilhaus/memain.c 2008-11-20 06:08:43.000000000 -0500
+++ linux/drivers/staging/meilhaus/~memain.c 2008-11-20 09:04:15.000000000 -0500
@@ -422,7 +422,7 @@ static int me_probe_pci(struct pci_dev *
PDEBUG("module_name: %s\n", module_name);
if ((constructor =
- (me_pci_constructor_t) __symbol_get(constructor_name)) == NULL) {
+ (me_pci_constructor_t) symbol_get(constructor_name)) == NULL) {
if (request_module(module_name)) {
PERROR("Error while request for module %s.\n",
module_name);
@@ -430,7 +430,7 @@ static int me_probe_pci(struct pci_dev *
}
if ((constructor =
- (me_pci_constructor_t) __symbol_get(constructor_name)) ==
+ (me_pci_constructor_t) symbol_get(constructor_name)) ==
NULL) {
PERROR("Can't get %s driver module constructor.\n",
module_name);
@@ -441,7 +441,7 @@ static int me_probe_pci(struct pci_dev *
if ((device & 0xF000) == 0x4000) { // Bosch build has differnt constructor for me4600.
if ((n_device =
(*constructor_bosch) (dev, me_bosch_fw)) == NULL) {
- __symbol_put(constructor_name);
+ symbol_put(constructor_name);
PERROR
("Can't get device instance of %s driver module.\n",
module_name);
@@ -450,7 +450,7 @@ static int me_probe_pci(struct pci_dev *
} else {
#endif
if ((n_device = (*constructor) (dev)) == NULL) {
- __symbol_put(constructor_name);
+ symbol_put(constructor_name);
PERROR
("Can't get device instance of %s driver module.\n",
module_name);
@@ -503,7 +503,7 @@ static void release_instance(me_device_t
if (plugged != ME_PLUGGED_IN) {
PDEBUG("release: medummy_constructor\n");
- __symbol_put("medummy_constructor");
+ symbol_put("medummy_constructor");
} else {
if ((dev_id & 0xF000) == 0x6000) { // Exceptions: me61xx, me62xx, me63xx are handled by one driver.
dev_id &= 0xF0FF;
@@ -513,7 +513,7 @@ static void release_instance(me_device_t
constructor_name[3] += (char)((dev_id >> 8) & 0x000F);
PDEBUG("release: %s\n", constructor_name);
- __symbol_put(constructor_name);
+ symbol_put(constructor_name);
}
}
--
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.
^ permalink raw reply
* Re: linux-next: manual merge of the wireless tree
From: John W. Linville @ 2008-11-20 13:48 UTC (permalink / raw)
To: David Miller
Cc: sfr, linux-next, johannes, tomas.winkler, reinette.chatre, yi.zhu
In-Reply-To: <20081120.002705.95132527.davem@davemloft.net>
On Thu, Nov 20, 2008 at 12:27:05AM -0800, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 20 Nov 2008 14:07:50 +1100
>
> > Today's linux-next merge of the wireless tree got a conflict in
> > drivers/net/wireless/iwlwifi/iwl-rx.c between commit
> > 4018517a1a69a85c3d61b20fa02f187b80773137 ("iwlagn: fix RX skb alignment")
> > from the wireless-current tree and commit
> > 07e27f25d0c73f42562473f642f20b8fa996a9de ("iwlwifi: move rx queue read
> > pointer into rxq") from the wireless tree.
> >
> > I wasn't sure how to resolve the conflict so have dropped the wireless
> > tree for today. I assume it will be fixed in the wireless (or net) tree
> > soon.
>
> I'll sort these out with John somehow, thanks for the report
> Stephen,
I have all these sorted (including the ieee80211_notify_mac one)
in the merge-test branch of wireless-next-2.6.
John
--
John W. Linville Linux should be at the core
linville@tuxdriver.com of your literate lifestyle.
^ permalink raw reply
* Re: [PATCH] sfc: Fix dependency for SFC_MTD
From: David Miller @ 2008-11-20 12:17 UTC (permalink / raw)
To: randy.dunlap
Cc: bhutchings, netdev, linux-net-drivers, dwmw2, sfr, linux-next
In-Reply-To: <4924872E.5070102@oracle.com>
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 19 Nov 2008 13:37:50 -0800
> Ben Hutchings wrote:
> > Randy Dunlap found that SFC_MTD was selected when sfc was built-in and
> > the MTD core was a module. Don't allow that combination.
> >
> > Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
>
> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
>
> I realized that this problem came up because SFC_MTD is a boolean
> that depends on tristates, so the boolean is set (=y) when
> SFC=y or SFC=m. Thus extra handling for it is needed,
> like Ben did here.
Applied, thanks everyone.
^ permalink raw reply
* Re: linux-next: manual merge of the s390 tree
From: Stephen Rothwell @ 2008-11-20 11:57 UTC (permalink / raw)
To: schwidefsky
Cc: Heiko Carstens, linux-next, David Gibson, Paul Mackerras,
Hendrik Brueckner
In-Reply-To: <1227179414.23671.1.camel@localhost>
[-- Attachment #1: Type: text/plain, Size: 667 bytes --]
Hi Martin,
On Thu, 20 Nov 2008 12:10:14 +0100 Martin Schwidefsky <schwidefsky@de.ibm.com> wrote:
>
> On Thu, 2008-11-20 at 10:13 +1100, Stephen Rothwell wrote:
> > Just overlapping additions. I fixed it up (see below) and can carry the
> > fix. The conflict could be eliminated by one of the two sets of changes
> > moving slightly in the files (I am hinting about the s390 ones here as
> > Paul does not like rebasing his tree ...).
>
> Ok, done. I moved the HCV_ICUV option before HVC_BEAT.
Thanks - just makes my life a little easier :-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH] md_print_devices: use le{32,64}_to_cpu to access data correctly
From: Neil Brown @ 2008-11-20 11:50 UTC (permalink / raw)
To: crquan
Cc: linux-raid, Stephen Rothwell, linux-next, Andrew Morton,
linux-kernel, wshen_gfkd
In-Reply-To: <1227179997-6394-1-git-send-email-crquan@gmail.com>
On Thursday November 20, crquan@gmail.com wrote:
> From: Cheng Renquan <crquan@gmail.com>
>
> The previous direct accessing have endian problems,
> Sorry for that lacking of thoughtful consideration.
>
> At the same time define a MASK value to get the seconds
> value of time conveniently.
Thanks.
I have merged this with the previous patch and also made the change
Stephen mentioned about casting 64bit values to (unsigned long long).
This has now been pushed out to for-next.
Where we print a 64bit value I changed the format string from %L
to %ll because that is what is used elsewhere in md.c, and consistency
is good.
On some architectures, a 64bit value is an "unsigned long", on others
it is "unsigned long long". So we cannot always print such a value
with %llx.
So I added a cast: (unsigned long long) to each 64 bit value that was
being passed to printk.
Thanks,
NeilBrown
>
> Signed-off-by: Cheng Renquan <crquan@gmail.com>
> ---
> This patch can be applied on git://neil.brown.name/md for-next branch.
>
> drivers/md/md.c | 38 +++++++++++++++++++++++---------------
> include/linux/raid/md_p.h | 2 ++
> 2 files changed, 25 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index ffc63be..058cf34 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -1664,37 +1664,45 @@ static void print_sb_1(struct mdp_superblock_1 *sb)
> __u8 *uuid;
>
> uuid = sb->set_uuid;
> - printk(KERN_INFO "md: SB: (V:%d) (F:%x) Array-ID:<%02x%02x%02x%02x"
> + printk(KERN_INFO "md: SB: (V:%u) (F:0x%08x) Array-ID:<%02x%02x%02x%02x"
> ":%02x%02x:%02x%02x:%02x%02x:%02x%02x%02x%02x%02x%02x>\n"
> KERN_INFO "md: Name: \"%s\" CT:%Lu\n",
> - sb->major_version, sb->feature_map,
> + le32_to_cpu(sb->major_version),
> + le32_to_cpu(sb->feature_map),
> uuid[0], uuid[1], uuid[2], uuid[3],
> uuid[4], uuid[5], uuid[6], uuid[7],
> uuid[8], uuid[9], uuid[10], uuid[11],
> uuid[12], uuid[13], uuid[14], uuid[15],
> sb->set_name,
> - sb->ctime & 0xffffffffffLL);
> + le64_to_cpu(sb->ctime) & MD_SUPERBLOCK_1_TIME_SEC_MASK);
>
> uuid = sb->device_uuid;
> - printk(KERN_INFO "md: L%d SZ%Ld RD:%d LO:%d CS:%d DO:%Ld DS:%Ld SO:%Ld"
> - " RO:%Ld\n"
> + printk(KERN_INFO "md: L%u SZ%Lu RD:%u LO:%u CS:%u DO:%Lu DS:%Lu SO:%Lu"
> + " RO:%Lu\n"
> KERN_INFO "md: Dev:%08x UUID: %02x%02x%02x%02x:%02x%02x:%02x%02x:%02x%02x"
> ":%02x%02x%02x%02x%02x%02x\n"
> - KERN_INFO "md: (F:%d) UT:%Lu Events:%Ld ResyncOffset:%Ld CSUM:%08x\n"
> - KERN_INFO "md: (MaxDev:%d) \n",
> - sb->level, sb->size, sb->raid_disks,
> - sb->layout, sb->chunksize,
> - sb->data_offset, sb->data_size,
> - sb->super_offset, sb->recovery_offset,
> - sb->dev_number,
> + KERN_INFO "md: (F:0x%08x) UT:%Lu Events:%Lu ResyncOffset:%Lu CSUM:0x%08x\n"
> + KERN_INFO "md: (MaxDev:%u) \n",
> + le32_to_cpu(sb->level),
> + le64_to_cpu(sb->size),
> + le32_to_cpu(sb->raid_disks),
> + le32_to_cpu(sb->layout),
> + le32_to_cpu(sb->chunksize),
> + le64_to_cpu(sb->data_offset),
> + le64_to_cpu(sb->data_size),
> + le64_to_cpu(sb->super_offset),
> + le64_to_cpu(sb->recovery_offset),
> + le32_to_cpu(sb->dev_number),
> uuid[0], uuid[1], uuid[2], uuid[3],
> uuid[4], uuid[5], uuid[6], uuid[7],
> uuid[8], uuid[9], uuid[10], uuid[11],
> uuid[12], uuid[13], uuid[14], uuid[15],
> sb->devflags,
> - sb->utime, sb->events,
> - sb->resync_offset,
> - sb->sb_csum, sb->max_dev
> + le64_to_cpu(sb->utime) & MD_SUPERBLOCK_1_TIME_SEC_MASK,
> + le64_to_cpu(sb->events),
> + le64_to_cpu(sb->resync_offset),
> + le32_to_cpu(sb->sb_csum),
> + le32_to_cpu(sb->max_dev)
> );
> }
>
> diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h
> index 8b4de4a..269e147 100644
> --- a/include/linux/raid/md_p.h
> +++ b/include/linux/raid/md_p.h
> @@ -194,6 +194,8 @@ static inline __u64 md_event(mdp_super_t *sb) {
> return (ev<<32)| sb->events_lo;
> }
>
> +#define MD_SUPERBLOCK_1_TIME_SEC_MASK ((1UL<<40) - 1)
> +
> /*
> * The version-1 superblock :
> * All numeric fields are little-endian.
> --
> 1.6.0.4.757.g6d002.dirty
>
> Cheng Renquan, Shenzhen, China
^ permalink raw reply
* [PATCH] md_print_devices: use le{32,64}_to_cpu to access data correctly
From: crquan @ 2008-11-20 11:19 UTC (permalink / raw)
To: NeilBrown, linux-raid
Cc: Stephen Rothwell, linux-next, Andrew Morton, linux-kernel,
wshen_gfkd
From: Cheng Renquan <crquan@gmail.com>
The previous direct accessing have endian problems,
Sorry for that lacking of thoughtful consideration.
At the same time define a MASK value to get the seconds
value of time conveniently.
Signed-off-by: Cheng Renquan <crquan@gmail.com>
---
This patch can be applied on git://neil.brown.name/md for-next branch.
drivers/md/md.c | 38 +++++++++++++++++++++++---------------
include/linux/raid/md_p.h | 2 ++
2 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index ffc63be..058cf34 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1664,37 +1664,45 @@ static void print_sb_1(struct mdp_superblock_1 *sb)
__u8 *uuid;
uuid = sb->set_uuid;
- printk(KERN_INFO "md: SB: (V:%d) (F:%x) Array-ID:<%02x%02x%02x%02x"
+ printk(KERN_INFO "md: SB: (V:%u) (F:0x%08x) Array-ID:<%02x%02x%02x%02x"
":%02x%02x:%02x%02x:%02x%02x:%02x%02x%02x%02x%02x%02x>\n"
KERN_INFO "md: Name: \"%s\" CT:%Lu\n",
- sb->major_version, sb->feature_map,
+ le32_to_cpu(sb->major_version),
+ le32_to_cpu(sb->feature_map),
uuid[0], uuid[1], uuid[2], uuid[3],
uuid[4], uuid[5], uuid[6], uuid[7],
uuid[8], uuid[9], uuid[10], uuid[11],
uuid[12], uuid[13], uuid[14], uuid[15],
sb->set_name,
- sb->ctime & 0xffffffffffLL);
+ le64_to_cpu(sb->ctime) & MD_SUPERBLOCK_1_TIME_SEC_MASK);
uuid = sb->device_uuid;
- printk(KERN_INFO "md: L%d SZ%Ld RD:%d LO:%d CS:%d DO:%Ld DS:%Ld SO:%Ld"
- " RO:%Ld\n"
+ printk(KERN_INFO "md: L%u SZ%Lu RD:%u LO:%u CS:%u DO:%Lu DS:%Lu SO:%Lu"
+ " RO:%Lu\n"
KERN_INFO "md: Dev:%08x UUID: %02x%02x%02x%02x:%02x%02x:%02x%02x:%02x%02x"
":%02x%02x%02x%02x%02x%02x\n"
- KERN_INFO "md: (F:%d) UT:%Lu Events:%Ld ResyncOffset:%Ld CSUM:%08x\n"
- KERN_INFO "md: (MaxDev:%d) \n",
- sb->level, sb->size, sb->raid_disks,
- sb->layout, sb->chunksize,
- sb->data_offset, sb->data_size,
- sb->super_offset, sb->recovery_offset,
- sb->dev_number,
+ KERN_INFO "md: (F:0x%08x) UT:%Lu Events:%Lu ResyncOffset:%Lu CSUM:0x%08x\n"
+ KERN_INFO "md: (MaxDev:%u) \n",
+ le32_to_cpu(sb->level),
+ le64_to_cpu(sb->size),
+ le32_to_cpu(sb->raid_disks),
+ le32_to_cpu(sb->layout),
+ le32_to_cpu(sb->chunksize),
+ le64_to_cpu(sb->data_offset),
+ le64_to_cpu(sb->data_size),
+ le64_to_cpu(sb->super_offset),
+ le64_to_cpu(sb->recovery_offset),
+ le32_to_cpu(sb->dev_number),
uuid[0], uuid[1], uuid[2], uuid[3],
uuid[4], uuid[5], uuid[6], uuid[7],
uuid[8], uuid[9], uuid[10], uuid[11],
uuid[12], uuid[13], uuid[14], uuid[15],
sb->devflags,
- sb->utime, sb->events,
- sb->resync_offset,
- sb->sb_csum, sb->max_dev
+ le64_to_cpu(sb->utime) & MD_SUPERBLOCK_1_TIME_SEC_MASK,
+ le64_to_cpu(sb->events),
+ le64_to_cpu(sb->resync_offset),
+ le32_to_cpu(sb->sb_csum),
+ le32_to_cpu(sb->max_dev)
);
}
diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h
index 8b4de4a..269e147 100644
--- a/include/linux/raid/md_p.h
+++ b/include/linux/raid/md_p.h
@@ -194,6 +194,8 @@ static inline __u64 md_event(mdp_super_t *sb) {
return (ev<<32)| sb->events_lo;
}
+#define MD_SUPERBLOCK_1_TIME_SEC_MASK ((1UL<<40) - 1)
+
/*
* The version-1 superblock :
* All numeric fields are little-endian.
--
1.6.0.4.757.g6d002.dirty
Cheng Renquan, Shenzhen, China
^ permalink raw reply related
* Re: linux-next: manual merge of the s390 tree
From: Martin Schwidefsky @ 2008-11-20 11:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Heiko Carstens, linux-next, David Gibson, Paul Mackerras,
Hendrik Brueckner
In-Reply-To: <20081120101309.0553d091.sfr@canb.auug.org.au>
On Thu, 2008-11-20 at 10:13 +1100, Stephen Rothwell wrote:
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix. The conflict could be eliminated by one of the two sets of changes
> moving slightly in the files (I am hinting about the s390 ones here as
> Paul does not like rebasing his tree ...).
Ok, done. I moved the HCV_ICUV option before HVC_BEAT.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
^ permalink raw reply
* Re: linux-next: Tree for November 19 (v4l2 warnings)
From: Mauro Carvalho Chehab @ 2008-11-20 11:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Randy Dunlap
In-Reply-To: <20081120110253.c0f2e80b.sfr@canb.auug.org.au>
On Thu, 20 Nov 2008 11:02:53 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Mauro,
>
> On Wed, 19 Nov 2008 10:51:00 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
> >
> > On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
>
> (Randy, I didn't really ...)
>
> > drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 3 has type 'struct v4l2_fract'
> > drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 4 has type 'struct v4l2_fract'
> > drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 5 has type 'struct v4l2_fract'
>
> Introduced in commit b35e0c6035369de9f3273b6a3fbb1c67f830cf49 "4L/DVB
> (9578): v4l core: add support for enumerating frame sizes and intervals"
> and been there for some time now.
>
> Mauro, please fix this.
I'll be fixing it today. Thank you and akpm for warning me.
>
--
Cheers,
Mauro
^ permalink raw reply
* linux-next: Tree for November 20
From: Stephen Rothwell @ 2008-11-20 10:29 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7488 bytes --]
Hi all,
Changes since 20081119:
Undropped trees:
driver-core
usb
staging
Dropped trees (temporarily):
rr (build problem)
proc (build problem)
userns (it depends on creds)
semaphore-removal (due to unfixed conflicts against Linus' tree)
The s390 tree gained a conflict against the powerpc tree.
The sched tree lost its conflict.
The net tree lost its 2 conflicts but gained another conflict against the
wireless-current tree and required two fixes to the merge.
The wireless tree gained a conflict against the wireless-current tree.
The rr tree gained a conflict against the s390 tree and also a build
failure that caused me to drop the tree.
The block tree lost its conflict.
The security-testing tree gained a conflict against the ocfs2 tree.
The proc tree gained 2 conflicts against the security-testing tree and a
build failure that caused me to drop the tree.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 126 trees (counting Linus' and 15 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 Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and 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 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/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-2.6.26
Merging dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
CONFLICT (content): Merge conflict in drivers/char/Kconfig
CONFLICT (content): Merge conflict in drivers/char/Makefile
CONFLICT (content): Merge conflict in include/linux/kernel.h
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in include/net/mac80211.h
Applying net: async_tx merge fix
Applying net: ieee80211_notify_mac merge fix
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/s390/include/asm/smp.h
CONFLICT (content): Merge conflict in arch/s390/kernel/smp.c
$ git reset --hard HEAD^
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
CONFLICT (delete/modify): drivers/net/wan/syncppp.c deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of drivers/net/wan/syncppp.c left in tree.
$ git rm -f drivers/net/wan/syncppp.c
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in fs/ocfs2/namei.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
CONFLICT (content): Merge conflict in fs/proc/base.c
CONFLICT (content): Merge conflict in kernel/exit.c
$ git reset --hard HEAD^
Merging bdev/master
Merging dwmw2-iommu/master
Merging cpu_alloc/cpu_alloc
CONFLICT (content): Merge conflict in kernel/lockdep.c
CONFLICT (content): Merge conflict in kernel/module.c
Applying cpu_alloc: merge_fix_1
Applying undefined reference to __per_cpu_start
Merging cputime/cputime
Merging perfmon3/master
Merging osd/linux-next
Merging fatfs/master
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ 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