* [PATCH -next] thinkpad_acpi: fix build, HOTKEY_POLL is optional
From: Randy Dunlap @ 2009-10-09 23:17 UTC (permalink / raw)
To: Stephen Rothwell, lenb
Cc: linux-next, LKML, Borislav Deianov, Henrique de Moraes Holschuh
In-Reply-To: <20091009190654.741eeffd.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix optional part of driver to be built optionally:
drivers/platform/x86/thinkpad_acpi.c:6251: error: implicit declaration of function 'tpacpi_hotkey_driver_mask_set'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/platform/x86/thinkpad_acpi.c | 2 ++
1 file changed, 2 insertions(+)
--- linux-next-20091009.orig/drivers/platform/x86/thinkpad_acpi.c
+++ linux-next-20091009/drivers/platform/x86/thinkpad_acpi.c
@@ -6245,12 +6245,14 @@ static int __init brightness_init(struct
ibm_backlight_device->props.brightness = b & TP_EC_BACKLIGHT_LVLMSK;
backlight_update_status(ibm_backlight_device);
+#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_BRGHT,
"brightness: registering brightness hotkeys "
"as change notification\n");
tpacpi_hotkey_driver_mask_set(hotkey_driver_mask
| TP_ACPI_HKEY_BRGHTUP_MASK
| TP_ACPI_HKEY_BRGHTDWN_MASK);;
+#endif
return 0;
}
^ permalink raw reply
* Re: linux-next: tree build failure
From: Hollis Blanchard @ 2009-10-09 19:14 UTC (permalink / raw)
To: Jan Beulich
Cc: sfr, Rusty Russell, linux-kernel, kvm-ppc, linux-next, akpm,
linuxppc-dev
In-Reply-To: <4AC9B5310200007800017EA1@vpn.id2.novell.com>
Rusty's version of BUILD_BUG_ON() does indeed fix the build break, and
also exposes the bug in kvmppc_account_exit_stat(). So to recap:
original: built but didn't work
Jan's: doesn't build
Rusty's: builds and works
Where do you want to go from here?
--
Hollis Blanchard
IBM Linux Technology Center
On Mon, 2009-10-05 at 07:58 +0100, Jan Beulich wrote:
> >>> Hollis Blanchard <hollisb@us.ibm.com> 02.10.09 17:48 >>>
> >On Wed, 2009-09-30 at 07:35 +0100, Jan Beulich wrote:
> >> The one Rusty suggested the other day may help here. I don't like it
> >> as a drop-in replacement for BUILD_BUG_ON() though (due to it
> >> deferring the error generated to the linking stage), I'd rather view
> >> this as an improvement to MAYBE_BUILD_BUG_ON() (which should
> >> then be used here).
> >
> >Can you be more specific?
> >
> >I have no idea what Rusty suggested where. I can't even guess what
>
> I'm attaching Rusty's response I was referring to.
>
> >MAYBE_BUILD_BUG_ON() is supposed to do (sounds like a terrible name).
>
> Agreed - but presumably better than just deleting the bogus instances
> altogether...
>
> Jan
> email message attachment
> > -------- Forwarded Message --------
> > From: Rusty Russell <rusty@rustcorp.com.au>
> > To: Jan Beulich <JBeulich@novell.com>
> > Cc: linux-kernel@vger.kernel.org
> > Subject: Re: [PATCH] fix BUILD_BUG_ON() and a couple of bogus uses
> > of it
> > Date: Wed, 23 Sep 2009 10:27:00 +0930
> >
> > On Wed, 19 Aug 2009 01:29:25 am Jan Beulich wrote:
> > > gcc permitting variable length arrays makes the current construct
> > > used for BUILD_BUG_ON() useless, as that doesn't produce any diagnostic
> > > if the controlling expression isn't really constant. Instead, this
> > > patch makes it so that a bit field gets used here. Consequently, those
> > > uses where the condition isn't really constant now also need fixing.
> > >
> > > Note that in the gfp.h, kmemcheck.h, and virtio_config.h cases
> > > MAYBE_BUILD_BUG_ON() really just serves documentation purposes - even
> > > if the expression is compile time constant (__builtin_constant_p()
> > > yields true), the array is still deemed of variable length by gcc, and
> > > hence the whole expression doesn't have the intended effect.
> > >
> > > Signed-off-by: Jan Beulich <jbeulich@novell.com>
> >
> > We used to use an undefined symbol here; diagnostics are worse but it catches
> > more stuff.
> >
> > Perhaps a hybrid is the way to go?
> >
> > #ifndef __OPTIMIZE__
> > #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
> > #else
> > /* If it's a constant, catch it at compile time, otherwise at link time. */
> > extern int __build_bug_on_failed;
> > #define BUILD_BUG_ON(condition) \
> > do { \
> > ((void)sizeof(char[1 - 2*!!(condition)])); \
> > if (condition) __build_bug_on_failed = 1; \
> > } while(0)
> > #endif
> >
> > Thanks,
> > Rusty.
^ permalink raw reply
* Re: linux-next: manual merge of the parisc tree with Linus' tree
From: Kyle McMartin @ 2009-10-09 18:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Kyle McMartin, linux-parisc, linux-next, linux-kernel,
David Howells
In-Reply-To: <20091009112158.7d37ed23.sfr@canb.auug.org.au>
On Fri, Oct 09, 2009 at 11:21:58AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the parisc tree got conflicts in
> arch/parisc/include/asm/thread_info.h and arch/parisc/kernel/entry.S
> between commit d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
> TIF_NOTIFY_RESUME to (almost) all architectures [try #6]") from Linus'
> tree and commit 9f4259771faf1ffd99888796d925adae4c93630b ("parisc: add
> TIF_NOTIFY_RESUME and use tracehook_notify_resume") from the parisc tree.
>
> It looks like the parisc tree version is a superset of the version in
> Linus' tree (for parisc). I fixed it up (hopefully - using the parisc
> tree versions) and can carry the fix for a while.
Sorry, forgot to push out a new #next. Should be sorted now.
Thanks for the heads up.
- Kyle
^ permalink raw reply
* Re: [PATCH] wireless: make WEXT_SPY and WEXT_PRIV select WEXT_CORE
From: Greg KH @ 2009-10-09 16:32 UTC (permalink / raw)
To: Johannes Berg
Cc: Randy Dunlap, devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
John W. Linville, linux-wireless-u79uwXL29TY76Z2rM5mHXA,
Stephen Rothwell, linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1255104846.4095.2.camel-YfaajirXv2244ywRPIzf9A@public.gmane.org>
On Fri, Oct 09, 2009 at 06:14:06PM +0200, Johannes Berg wrote:
> On Fri, 2009-10-09 at 09:06 -0700, Randy Dunlap wrote:
>
> > > menuconfig WLAN
> > > bool "Wireless LAN"
> > > depends on !S390
> > > + select WIRELESS
> > > default y
> > > ---help---
> > > This section contains all the pre 802.11 and 802.11 wireless
> >
> >
> > I suppose that's OK, although I prefer "depends" rather than "select".
>
> I tend to as well, but in this case the WIRELESS itself is just an
> option that makes other options invisible, it's not used elsewhere, and
> as such I think this is ok -- why hide the wireless drivers unless the
> user first selects the wireless core options?
>
> OTOH, you already need to select cfg80211/mac80211 for most drivers, so
> I suppose "depends on WIRELESS" would be ok too.
>
> > I tracked down one of the problems that I was seeing:
> >
> > net/wireless/wext-priv.c:206: error: implicit declaration of function 'call_commit_handler'
> >
> > with:
> > # CONFIG_WIRELESS is not set
> > CONFIG_WIRELESS_EXT=y
> > CONFIG_WEXT_PRIV=y
> >
> > This is being caused by several drivers in drivers/staging/ doing
> > select WEXT_PRIV
> > without using either enough dependencies or even more (ugly) selects.
> > (or just because kconfig isn't sufficient)
>
> Hah, staging/, well, that's kinda hard to solve I guess. Except by
> fixing all the staging/ drivers to depend on WIRELESS too, like the
> patch would do for the regular drivers.
That's fine, I'll gladly take patches to do that.
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] wireless: make WEXT_SPY and WEXT_PRIV select WEXT_CORE
From: Johannes Berg @ 2009-10-09 16:14 UTC (permalink / raw)
To: Randy Dunlap
Cc: gregkh, devel, John W. Linville, linux-wireless, Stephen Rothwell,
linux-next, linux-kernel
In-Reply-To: <20091009090601.73de5dc6.randy.dunlap@oracle.com>
[-- Attachment #1: Type: text/plain, Size: 1560 bytes --]
On Fri, 2009-10-09 at 09:06 -0700, Randy Dunlap wrote:
> > menuconfig WLAN
> > bool "Wireless LAN"
> > depends on !S390
> > + select WIRELESS
> > default y
> > ---help---
> > This section contains all the pre 802.11 and 802.11 wireless
>
>
> I suppose that's OK, although I prefer "depends" rather than "select".
I tend to as well, but in this case the WIRELESS itself is just an
option that makes other options invisible, it's not used elsewhere, and
as such I think this is ok -- why hide the wireless drivers unless the
user first selects the wireless core options?
OTOH, you already need to select cfg80211/mac80211 for most drivers, so
I suppose "depends on WIRELESS" would be ok too.
> I tracked down one of the problems that I was seeing:
>
> net/wireless/wext-priv.c:206: error: implicit declaration of function 'call_commit_handler'
>
> with:
> # CONFIG_WIRELESS is not set
> CONFIG_WIRELESS_EXT=y
> CONFIG_WEXT_PRIV=y
>
> This is being caused by several drivers in drivers/staging/ doing
> select WEXT_PRIV
> without using either enough dependencies or even more (ugly) selects.
> (or just because kconfig isn't sufficient)
Hah, staging/, well, that's kinda hard to solve I guess. Except by
fixing all the staging/ drivers to depend on WIRELESS too, like the
patch would do for the regular drivers.
I think you can get the same effect now with the non-staging drivers.
I'll submit this patch formally and ask John to include it, and staging/
can just depend on WIRELESS.
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply
* Re: [PATCH] wireless: make WEXT_SPY and WEXT_PRIV select WEXT_CORE
From: Randy Dunlap @ 2009-10-09 16:06 UTC (permalink / raw)
To: Johannes Berg, gregkh, devel
Cc: John W. Linville, linux-wireless, Stephen Rothwell, linux-next,
linux-kernel
In-Reply-To: <1255026563.3713.28.camel@johannes.local>
On Thu, 08 Oct 2009 20:29:23 +0200 Johannes Berg wrote:
> On Thu, 2009-10-08 at 08:06 -0700, Randy Dunlap wrote:
>
> > > It's kinda strange though that you can select wireless drivers without
> > > selecting WIRELESS. Maybe the solution is as simple as making WLAN
> > > (drivers/net/wireless/Kconfig) depend on WIRELESS?
> >
> > Yes, I think that would be a very good start.
>
> On the other hand, of course, the whole WIRELESS thing is somewhat
> stupid. How about this?
>
> johannes
>
> From: Johannes Berg <johannes@sipsolutions.net>
> Subject: wireless: make wireless drivers select core
>
> It is somewhat non-sensical to allow selecting wireless
> drivers without showing wireless core code options, and
> since the wext refactoring this has made it possible to
> generate configurations that will not build. Avoid this
> and make wireless drivers select the wireless options.
>
> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
> ---
> drivers/net/wireless/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> --- wireless-testing.orig/drivers/net/wireless/Kconfig 2009-10-08 20:25:04.000000000 +0200
> +++ wireless-testing/drivers/net/wireless/Kconfig 2009-10-08 20:27:38.000000000 +0200
> @@ -5,6 +5,7 @@
> menuconfig WLAN
> bool "Wireless LAN"
> depends on !S390
> + select WIRELESS
> default y
> ---help---
> This section contains all the pre 802.11 and 802.11 wireless
I suppose that's OK, although I prefer "depends" rather than "select".
I tracked down one of the problems that I was seeing:
net/wireless/wext-priv.c:206: error: implicit declaration of function 'call_commit_handler'
with:
# CONFIG_WIRELESS is not set
CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_PRIV=y
This is being caused by several drivers in drivers/staging/ doing
select WEXT_PRIV
without using either enough dependencies or even more (ugly) selects.
(or just because kconfig isn't sufficient)
---
~Randy
^ permalink raw reply
* Re: i7core_edac tree
From: Stephen Rothwell @ 2009-10-09 13:48 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, dougthompson, bluesmoke-devel
In-Reply-To: <126686523.1755491255056754615.JavaMail.root@zmail05.collab.prod.int.phx2.redhat.com>
[-- Attachment #1: Type: text/plain, Size: 1787 bytes --]
Hi Mauro,
On Thu, 8 Oct 2009 22:52:34 -0400 (EDT) Mauro Carvalho Chehab <mchehab@redhat.com> wrote:
>
> Hmm... it didn't created a new branch there... Fixed. The branch were already pushed.
OK, I will add it on Monday.
Boilerplate:
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: Tree for October 9
From: Stephen Rothwell @ 2009-10-09 8:06 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8179 bytes --]
Hi all,
Changes since 20091008:
New trees: staging.current
reiserfs-bkl
My fixes tree contains a build fix for powerpc/kvm.
Linus' tree gained a build failure for which I reverted a commit.
The parisc tree gained a conflict against Linus' tree.
The mfd tree still has a build failure so I used the version from
next-20091005.
The drm tree lost its conflicts.
The suspend tree lost its build failure.
----------------------------------------------------------------------------
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 142 trees (counting Linus' and 22 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 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/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
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 arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c
CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree.
$ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c
Merging parisc/next
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/ptrace.c
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
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 jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging tmio-mmc/linux-next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
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 mfd/for-next
$ git reset --hard HEAD^
Merging refs/next/20091005/mfd
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
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
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/for-jens
CONFLICT (add/add): Merge conflict in drivers/block/drbd/Kconfig
CONFLICT (add/add): Merge conflict in drivers/block/drbd/Makefile
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_actlog.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_int.h
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_main.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_nl.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_receiver.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_req.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_worker.c
CONFLICT (add/add): Merge conflict in include/linux/drbd.h
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in lib/Kconfig
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/mtd/maps/gpio-addr-flash.c
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
[master 9b2aec4] Revert "ahci: filter FPDMA non-zero offset enable for Aspire 3810T"
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: origin tree build failure
From: Stephen Rothwell @ 2009-10-09 7:50 UTC (permalink / raw)
To: Linus, Andrew Morton; +Cc: linux-next, linux-kernel, Tejun Heo, Jeff Garzik
[-- Attachment #1: Type: text/plain, Size: 626 bytes --]
Hi all,
Today's linux-next build (powerpc allyesconfig) failed like this:
drivers/ata/ahci.c: In function 'ahci_gtf_filter_workaround':
drivers/ata/ahci.c:2927: error: 'struct ata_device' has no member named 'gtf_filter'
Caused by commit f80ae7e45a0e03da188494c6e947a5c8b0cdfb4a ("ahci: filter
FPDMA non-zero offset enable for Aspire 3810T") from Linus' tree.
gtf_filter only exists in struct ata_device when CONFIG_ATA_ACPI is set
(which it isn't on PowerPC).
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: 198 bytes --]
^ permalink raw reply
* Re: i7core_edac tree
From: Mauro Carvalho Chehab @ 2009-10-09 2:52 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, bluesmoke-devel, dougthompson
In-Reply-To: <20091009101653.44b2f448.sfr@canb.auug.org.au>
----- "Stephen Rothwell" <sfr@canb.auug.org.au> escreveu:
> Hi Mauro,
>
> On Thu, 8 Oct 2009 14:26:31 -0300 Mauro Carvalho Chehab
> <mchehab@redhat.com> wrote:
> >
> > Could you please add my i7core_edac tree to linux-next?
> >
> > It is available at branch linux-next:
> > git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git
> linux-next
>
> That tree has no "linux-next" branch ...
Hmm... it didn't created a new branch there... Fixed. The branch were already pushed.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
^ permalink raw reply
* Re: [PATCH] linux-next: 20090929 - android driver build breaks
From: Greg KH @ 2009-10-09 0:22 UTC (permalink / raw)
To: David Rientjes
Cc: Kamalesh Babulal, linux-next, LKML, sfr, Andrew Morton,
Arve Hjonnevag, San Mehat
In-Reply-To: <alpine.DEB.1.00.0910081644200.14247@chino.kir.corp.google.com>
On Thu, Oct 08, 2009 at 04:48:23PM -0700, David Rientjes wrote:
> On Thu, 8 Oct 2009, Greg KH wrote:
>
> > > What are you specifically referring to? Kamalesh provided a patch[*] that
> > > fixes this particular compile error, which you said you were queueing.
> >
> > Hm, I did say I was queueing it, but I still can't figure out if this is
> > needed for the 2.6.32 tree. Is it?
> >
>
> Yes, 28b83c5 was merged during the merge window for 2.6.32 so this needs
> to be pushed for the staging tree if it's not ripped out.
Ok, I'll dig it up, thanks.
> > > If it's a criticism of the staleness of the Android code within the
> > > staging tree or no recent activity, then we should probably loop in some
> > > Android developers to find our about their plans. I've added them to the
> > > cc.
> >
> > They know all about this and agreed that the code should be dropped for
> > 2.6.33 if no one sends me patches. If someone does, then I will remove
> > my 'delete the android code' patch in the staging tree.
> >
>
> I don't work with Android, but the "no support from Google" phrase caught
> my attention :) It seems like this isn't necessarily about support or
> raised issues not being addressed, but rather about a lack of progress
> being made developmentally or a general lack of interest in upstream
> inclusion.
Yes, that is exactly correct.
thanks,
greg k-h
^ permalink raw reply
* linux-next: manual merge of the parisc tree with Linus' tree
From: Stephen Rothwell @ 2009-10-09 0:21 UTC (permalink / raw)
To: Kyle McMartin, linux-parisc; +Cc: linux-next, linux-kernel, David Howells
[-- Attachment #1: Type: text/plain, Size: 737 bytes --]
Hi all,
Today's linux-next merge of the parisc tree got conflicts in
arch/parisc/include/asm/thread_info.h and arch/parisc/kernel/entry.S
between commit d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
TIF_NOTIFY_RESUME to (almost) all architectures [try #6]") from Linus'
tree and commit 9f4259771faf1ffd99888796d925adae4c93630b ("parisc: add
TIF_NOTIFY_RESUME and use tracehook_notify_resume") from the parisc tree.
It looks like the parisc tree version is a superset of the version in
Linus' tree (for parisc). I fixed it up (hopefully - using the parisc
tree versions) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: [PATCH] linux-next: 20090929 - android driver build breaks
From: David Rientjes @ 2009-10-08 23:48 UTC (permalink / raw)
To: Greg KH
Cc: Kamalesh Babulal, linux-next, LKML, sfr, Andrew Morton,
Arve Hjonnevag, San Mehat
In-Reply-To: <20091008232825.GA540@suse.de>
On Thu, 8 Oct 2009, Greg KH wrote:
> > What are you specifically referring to? Kamalesh provided a patch[*] that
> > fixes this particular compile error, which you said you were queueing.
>
> Hm, I did say I was queueing it, but I still can't figure out if this is
> needed for the 2.6.32 tree. Is it?
>
Yes, 28b83c5 was merged during the merge window for 2.6.32 so this needs
to be pushed for the staging tree if it's not ripped out.
> > If it's a criticism of the staleness of the Android code within the
> > staging tree or no recent activity, then we should probably loop in some
> > Android developers to find our about their plans. I've added them to the
> > cc.
>
> They know all about this and agreed that the code should be dropped for
> 2.6.33 if no one sends me patches. If someone does, then I will remove
> my 'delete the android code' patch in the staging tree.
>
I don't work with Android, but the "no support from Google" phrase caught
my attention :) It seems like this isn't necessarily about support or
raised issues not being addressed, but rather about a lack of progress
being made developmentally or a general lack of interest in upstream
inclusion. If it was agreed to simply remove it, that's fine, I just was
curious about the rationale.
^ permalink raw reply
* Re: [PATCH] linux-next: 20090929 - android driver build breaks
From: Greg KH @ 2009-10-08 23:28 UTC (permalink / raw)
To: David Rientjes
Cc: Greg KH, Kamalesh Babulal, linux-next, LKML, sfr, Andrew Morton,
Arve Hjonnevag, San Mehat
In-Reply-To: <alpine.DEB.1.00.0910081621340.10613@chino.kir.corp.google.com>
On Thu, Oct 08, 2009 at 04:24:46PM -0700, David Rientjes wrote:
> On Thu, 8 Oct 2009, Greg KH wrote:
>
> > > Hi Greg,
> > >
> > > next-20090929 randconfig build breaks with
> > > CONFIG_ANDROID_LOW_MEMORY_KILLER=y
> >
> > Due to no support from Google, I've dropped the android code from the
> > staging tree for 2.6.33.
> >
>
> What are you specifically referring to? Kamalesh provided a patch[*] that
> fixes this particular compile error, which you said you were queueing.
Hm, I did say I was queueing it, but I still can't figure out if this is
needed for the 2.6.32 tree. Is it?
> If it's a criticism of the staleness of the Android code within the
> staging tree or no recent activity, then we should probably loop in some
> Android developers to find our about their plans. I've added them to the
> cc.
They know all about this and agreed that the code should be dropped for
2.6.33 if no one sends me patches. If someone does, then I will remove
my 'delete the android code' patch in the staging tree.
Honestly, I'm not holding my breath :(
thanks,
greg k-h
^ permalink raw reply
* Re: [PATCH] linux-next: 20090929 - android driver build breaks
From: David Rientjes @ 2009-10-08 23:24 UTC (permalink / raw)
To: Greg KH
Cc: Kamalesh Babulal, Greg Kroah-Hartman, linux-next, LKML, sfr,
Andrew Morton, Arve Hjonnevag, San Mehat
In-Reply-To: <20091008224725.GA22949@kroah.com>
On Thu, 8 Oct 2009, Greg KH wrote:
> > Hi Greg,
> >
> > next-20090929 randconfig build breaks with
> > CONFIG_ANDROID_LOW_MEMORY_KILLER=y
>
> Due to no support from Google, I've dropped the android code from the
> staging tree for 2.6.33.
>
What are you specifically referring to? Kamalesh provided a patch[*] that
fixes this particular compile error, which you said you were queueing.
If it's a criticism of the staleness of the Android code within the
staging tree or no recent activity, then we should probably loop in some
Android developers to find our about their plans. I've added them to the
cc.
[*] http://marc.info/?l=linux-kernel&m=125423765013043
^ permalink raw reply
* Re: Changes to gregkh's kernel trees
From: Stephen Rothwell @ 2009-10-08 23:18 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next
In-Reply-To: <20091008184150.GA20399@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
Hi Greg,
On Thu, 8 Oct 2009 11:41:50 -0700 Greg KH <greg@kroah.com> wrote:
>
> I've added a new tree to my kernel trees, the "staging.current" one. It
> works like the other "usb.current", "tty.current" and others in that it
> contains patches from the staging tree that are going to be sent to
> Linus for the "current" kernel release.
I have added staging.current from today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: i7core_edac tree
From: Stephen Rothwell @ 2009-10-08 23:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, dougthompson, bluesmoke-devel
In-Reply-To: <20091008142631.67812211@pedra.chehab.org>
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
Hi Mauro,
On Thu, 8 Oct 2009 14:26:31 -0300 Mauro Carvalho Chehab <mchehab@redhat.com> wrote:
>
> Could you please add my i7core_edac tree to linux-next?
>
> It is available at branch linux-next:
> git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git linux-next
That tree has no "linux-next" branch ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: [PATCH] linux-next: 20090929 - android driver build breaks
From: Greg KH @ 2009-10-08 22:47 UTC (permalink / raw)
To: Kamalesh Babulal; +Cc: gregkh, linux-next, LKML, sfr, akpm, rientjes
In-Reply-To: <20090929152027.GC4373@linux.vnet.ibm.com>
On Tue, Sep 29, 2009 at 08:50:27PM +0530, Kamalesh Babulal wrote:
> Hi Greg,
>
> next-20090929 randconfig build breaks with
> CONFIG_ANDROID_LOW_MEMORY_KILLER=y
Due to no support from Google, I've dropped the android code from the
staging tree for 2.6.33.
thanks,
greg k-h
^ permalink raw reply
* Re: [PATCH suspend-2.6#linux-next] PM / freezer: add missing include
From: Rafael J. Wysocki @ 2009-10-08 20:51 UTC (permalink / raw)
To: Tejun Heo; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <4ACDAF18.2030705@kernel.org>
On Thursday 08 October 2009, Tejun Heo wrote:
> Fix compile failure caused by a48145a7cbf3b0555ba3ad61aaf2c38719bab95d
> forgetting to include delay.h.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
I folded it into the original patch and pushed the updated tree.
Thanks,
Rafael
> ---
> kernel/power/process.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/kernel/power/process.c b/kernel/power/process.c
> index 66161f0..5ade1bd 100644
> --- a/kernel/power/process.c
> +++ b/kernel/power/process.c
> @@ -14,6 +14,7 @@
> #include <linux/module.h>
> #include <linux/syscalls.h>
> #include <linux/freezer.h>
> +#include <linux/delay.h>
>
> /*
> * Timeout for stopping processes
>
>
^ permalink raw reply
* Changes to gregkh's kernel trees
From: Greg KH @ 2009-10-08 18:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
Hi Stephen.
I've added a new tree to my kernel trees, the "staging.current" one. It
works like the other "usb.current", "tty.current" and others in that it
contains patches from the staging tree that are going to be sent to
Linus for the "current" kernel release.
I've adjusted all of the NEXT_BASE tags in the series files to pull
from, and as always, it can all be found at:
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
If you have any problems with this, please let me know.
thanks, and keep up the great work, it is much appreciated.
greg k-h
^ permalink raw reply
* Re: [PATCH] wireless: make WEXT_SPY and WEXT_PRIV select WEXT_CORE
From: Johannes Berg @ 2009-10-08 18:29 UTC (permalink / raw)
To: Randy Dunlap
Cc: John W. Linville, linux-wireless, Stephen Rothwell, linux-next,
linux-kernel
In-Reply-To: <20091008080615.09c8b803.randy.dunlap@oracle.com>
On Thu, 2009-10-08 at 08:06 -0700, Randy Dunlap wrote:
> > It's kinda strange though that you can select wireless drivers without
> > selecting WIRELESS. Maybe the solution is as simple as making WLAN
> > (drivers/net/wireless/Kconfig) depend on WIRELESS?
>
> Yes, I think that would be a very good start.
On the other hand, of course, the whole WIRELESS thing is somewhat
stupid. How about this?
johannes
From: Johannes Berg <johannes@sipsolutions.net>
Subject: wireless: make wireless drivers select core
It is somewhat non-sensical to allow selecting wireless
drivers without showing wireless core code options, and
since the wext refactoring this has made it possible to
generate configurations that will not build. Avoid this
and make wireless drivers select the wireless options.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
drivers/net/wireless/Kconfig | 1 +
1 file changed, 1 insertion(+)
--- wireless-testing.orig/drivers/net/wireless/Kconfig 2009-10-08 20:25:04.000000000 +0200
+++ wireless-testing/drivers/net/wireless/Kconfig 2009-10-08 20:27:38.000000000 +0200
@@ -5,6 +5,7 @@
menuconfig WLAN
bool "Wireless LAN"
depends on !S390
+ select WIRELESS
default y
---help---
This section contains all the pre 802.11 and 802.11 wireless
^ permalink raw reply
* i7core_edac tree
From: Mauro Carvalho Chehab @ 2009-10-08 17:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, bluesmoke-devel, dougthompson
Hi Stephen,
Could you please add my i7core_edac tree to linux-next?
It is available at branch linux-next:
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git linux-next
This tree contains the driver for Nehalem memory controller EDAC driver.
My original intention were to submit it upstream, but the driver review were
delayed, and they required some changes that it is better to test, letting it to
be added upstream for 2.6.33.
--
Cheers,
Mauro
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
^ permalink raw reply
* Re: [PATCH pci-2.6#linux-next] pci: pci_dfl_cache_line_size is __devinitdata
From: Jesse Barnes @ 2009-10-08 17:25 UTC (permalink / raw)
To: Tejun Heo; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <4ACDB819.4060606@kernel.org>
On Thu, 08 Oct 2009 18:59:53 +0900
Tejun Heo <tj@kernel.org> wrote:
> pci_dfl_cache_line_size is marked as __initdata but referenced by
> pci_init() which is __devinit. Make it __devinitdata instead of
> __initdata.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/pci/pci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 1ae95df..a6e22fd 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -53,7 +53,7 @@ unsigned long pci_hotplug_mem_size =
> DEFAULT_HOTPLUG_MEM_SIZE;
> * the dfl or actual value as it sees fit. Don't forget this is
> * measured in 32-bit words, not bytes.
> */
> -u8 pci_dfl_cache_line_size __initdata = L1_CACHE_BYTES >> 2;
> +u8 pci_dfl_cache_line_size __devinitdata = L1_CACHE_BYTES >> 2;
> u8 pci_cache_line_size;
Fix pushed, thanks for the quick turnaround Tejun.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply
* Re: [PATCH] wireless: make WEXT_SPY and WEXT_PRIV select WEXT_CORE
From: Randy Dunlap @ 2009-10-08 15:06 UTC (permalink / raw)
To: Johannes Berg
Cc: John W. Linville, linux-wireless, Stephen Rothwell, linux-next,
linux-kernel
In-Reply-To: <1254995282.3713.18.camel@johannes.local>
On Thu, 08 Oct 2009 11:48:02 +0200 Johannes Berg wrote:
> On Wed, 2009-10-07 at 17:12 -0700, Randy Dunlap wrote:
>
> > > > # CONFIG_WIRELESS is not set
> > > > CONFIG_WIRELESS_EXT=y
> > > > CONFIG_WEXT_SPY=y
> > > > CONFIG_WEXT_PRIV=y
> > > >
> > > > WEXT_CORE is not enabled. I haven't found the culprit, but I suspect "select".
> > >
> > > Interesting.
> > >
> > > > but what in WIRELESS_EXT would also cause WEXT_CORE to be enabled?
> > >
> > > Well, the way WEXT_CORE is defined as def_bool y ought to, no?
> >
> > Ah, I see what you mean.
> >
> > Here's what's happening:
> >
> > net/wireless/Kconfig says:
> >
> > config WEXT_CORE
> > def_bool y
> > depends on CFG80211_WEXT || WIRELESS_EXT
> >
> >
> > and net/Kconfig says:
> >
> > if WIRELESS
> >
> > source "net/wireless/Kconfig"
> > source "net/mac80211/Kconfig"
> >
> > endif # WIRELESS
> >
> >
> > so WEXT_CORE actually depends on NET && WIRELESS && (CFG80211_WEXT || WIRELESS_EXT)
> > (that's what xconfig shows me).
> > But WIRELESS is not enabled. Pooh.
> >
> > I was already toying with making CONFIG_WIRELESS a real/usable kconfig symbol.
> > That may have to be done unless someone else comes up with another solution.
>
> Ah!
>
> It's kinda strange though that you can select wireless drivers without
> selecting WIRELESS. Maybe the solution is as simple as making WLAN
> (drivers/net/wireless/Kconfig) depend on WIRELESS?
Yes, I think that would be a very good start.
---
~Randy
^ permalink raw reply
* Re: linux-next: build warnings (buffer size is not provably correct)
From: Arjan van de Ven @ 2009-10-08 13:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, James Morris, David Howells,
Wim Van Sebroeck, Al Viro, akpm
In-Reply-To: <20091008154710.a351a56b.sfr@canb.auug.org.au>
On Thu, 8 Oct 2009 15:47:10 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next build (i386 defconfig) produced these warnings:
>
> In file included from arch/x86/include/asm/uaccess.h:572,
> from kernel/capability.c:18:
> arch/x86/include/asm/uaccess_32.h: In function 'sys_capset':
the following needs to go somewhere... Andrew ?
From: Arjan van de Ven <arjan@linux.intel.com>
Subject: [PATCH 7/9] Simplify bound checks in capabilities for copy_from_user
CC: James Morris <jmorris@namei.org>
The capabilities syscall has a copy_from_user() call where gcc currently
cannot prove to itself that the copy is always within bounds.
This patch adds a very explicity bound check to prove to gcc that
this copy_from_user cannot overflow its destination buffer.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Acked-by: James Morris <jmorris@namei.org>
diff --git a/kernel/capability.c b/kernel/capability.c
index 4e17041..204f11f 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -238,7 +241,7 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
SYSCALL_DEFINE2(capset, cap_user_header_t, header, const cap_user_data_t, data)
{
struct __user_cap_data_struct kdata[_KERNEL_CAPABILITY_U32S];
- unsigned i, tocopy;
+ unsigned i, tocopy, copybytes;
kernel_cap_t inheritable, permitted, effective;
struct cred *new;
int ret;
@@ -255,8 +258,11 @@ SYSCALL_DEFINE2(capset, cap_user_header_t, header, const cap_user_data_t, data)
if (pid != 0 && pid != task_pid_vnr(current))
return -EPERM;
- if (copy_from_user(&kdata, data,
- tocopy * sizeof(struct __user_cap_data_struct)))
+ copybytes = tocopy * sizeof(struct __user_cap_data_struct);
+ if (copybytes > sizeof(kdata))
+ return -EFAULT;
+
+ if (copy_from_user(&kdata, data, copybytes))
return -EFAULT;
for (i = 0; i < tocopy; i++) {
--
Arjan van de Ven Intel Open Source Technology Centre
For development, discussion and tips for power savings,
visit http://www.lesswatts.org
^ permalink raw reply related
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