* linux-next: manual merge of the ia64 tree with Linus' tree
From: Stephen Rothwell @ 2009-09-17 1:33 UTC (permalink / raw)
To: Luck, Tony; +Cc: linux-next, linux-kernel, Tejun Heo, Nelson Elhage
Hi Tony,
Today's linux-next merge of the ia64 tree got a conflict in
arch/ia64/kernel/vmlinux.lds.S between commit
023bf6f1b8bf58dc4da7f0dc1cf4787b0d5297c1 ("linker script: unify usage of
discard definition") from Linus' tree and commit
6ae86350857bf3e862f8dcd10039ccb45e056f85 ("[IA64] Clean up linker script
using standard macros") from the ia64 tree.
I fixed it up (I think - see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/ia64/kernel/vmlinux.lds.S
index eb4214d,f69f411..0000000
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@@ -284,39 -228,8 +228,10 @@@ SECTION
_end = .;
code : { } :code
- /* Stabs debugging sections. */
- .stab 0 : { *(.stab) }
- .stabstr 0 : { *(.stabstr) }
- .stab.excl 0 : { *(.stab.excl) }
- .stab.exclstr 0 : { *(.stab.exclstr) }
- .stab.index 0 : { *(.stab.index) }
- .stab.indexstr 0 : { *(.stab.indexstr) }
- /* DWARF debug sections.
- Symbols in the DWARF debugging sections are relative to the beginning
- of the section so we begin them at 0. */
- /* DWARF 1 */
- .debug 0 : { *(.debug) }
- .line 0 : { *(.line) }
- /* GNU DWARF 1 extensions */
- .debug_srcinfo 0 : { *(.debug_srcinfo) }
- .debug_sfnames 0 : { *(.debug_sfnames) }
- /* DWARF 1.1 and DWARF 2 */
- .debug_aranges 0 : { *(.debug_aranges) }
- .debug_pubnames 0 : { *(.debug_pubnames) }
- /* DWARF 2 */
- .debug_info 0 : { *(.debug_info) }
- .debug_abbrev 0 : { *(.debug_abbrev) }
- .debug_line 0 : { *(.debug_line) }
- .debug_frame 0 : { *(.debug_frame) }
- .debug_str 0 : { *(.debug_str) }
- .debug_loc 0 : { *(.debug_loc) }
- .debug_macinfo 0 : { *(.debug_macinfo) }
- /* SGI/MIPS DWARF 2 extensions */
- .debug_weaknames 0 : { *(.debug_weaknames) }
- .debug_funcnames 0 : { *(.debug_funcnames) }
- .debug_typenames 0 : { *(.debug_typenames) }
- .debug_varnames 0 : { *(.debug_varnames) }
+
+ STABS_DEBUG
+ DWARF_DEBUG
- /DISCARD/ : { *(.note) }
+
+ /* Default discards */
+ DISCARDS
}
^ permalink raw reply
* linux-next: manual merge of the blackfin tree with Linus' tree
From: Stephen Rothwell @ 2009-09-17 1:26 UTC (permalink / raw)
To: Mike Frysinger; +Cc: linux-next, linux-kernel, Tejun Heo
Hi Mike,
Today's linux-next merge of the blackfin tree got a conflict in
arch/blackfin/mm/sram-alloc.c between commit
b9bf3121af348d9255f1c917830fe8c2df52efcb ("percpu: use
DEFINE_PER_CPU_SHARED_ALIGNED()") from Linus' tree and commit
40bf94d6d1158fb6d6d67a666e6b16ab6ac3986e ("Blackfin: push SRAM locks down
into related ifdefs") from the blackfin tree.
The latter moved the code that the former modified. I fixed it up (see
below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/blackfin/mm/sram-alloc.c
index 99e4dbb,e095094..0000000
--- a/arch/blackfin/mm/sram-alloc.c
+++ b/arch/blackfin/mm/sram-alloc.c
@@@ -55,6 -50,7 +50,7 @@@ struct sram_piece
struct sram_piece *next;
};
-static DEFINE_PER_CPU(spinlock_t, l1sram_lock) ____cacheline_aligned_in_smp;
++static DEFINE_PER_CPU_SHARED_ALIGNED(spinlock_t, l1sram_lock);
static DEFINE_PER_CPU(struct sram_piece, free_l1_ssram_head);
static DEFINE_PER_CPU(struct sram_piece, used_l1_ssram_head);
@@@ -68,7 -64,12 +64,12 @@@ static DEFINE_PER_CPU(struct sram_piece
static DEFINE_PER_CPU(struct sram_piece, used_l1_data_B_sram_head);
#endif
+ #if L1_DATA_A_LENGTH || L1_DATA_B_LENGTH
-static DEFINE_PER_CPU(spinlock_t, l1_data_sram_lock) ____cacheline_aligned_in_smp;
++static DEFINE_PER_CPU_SHARED_ALIGNED(spinlock_t, l1_data_sram_lock);
+ #endif
+
#if L1_CODE_LENGTH != 0
-static DEFINE_PER_CPU(spinlock_t, l1_inst_sram_lock) ____cacheline_aligned_in_smp;
++static DEFINE_PER_CPU_SHARED_ALIGNED(spinlock_t, l1_inst_sram_lock);
static DEFINE_PER_CPU(struct sram_piece, free_l1_inst_sram_head);
static DEFINE_PER_CPU(struct sram_piece, used_l1_inst_sram_head);
#endif
^ permalink raw reply
* linux-next: input-current tree build failure
From: Stephen Rothwell @ 2009-09-17 1:12 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1347 bytes --]
Hi Dmitry,
Today's linux-next build (x86_64 allmodconfig) failed like this:
In file included from drivers/input/serio/i8042.c:23:
include/linux/i8042.h: In function 'i8042_check_port_owner':
include/linux/i8042.h:58: error: parameter name omitted
drivers/input/serio/i8042.c: At top level:
drivers/input/serio/i8042.c:130: error: redefinition of 'i8042_lock_chip'
include/linux/i8042.h:45: note: previous definition of 'i8042_lock_chip' was here
drivers/input/serio/i8042.c:136: error: redefinition of 'i8042_unlock_chip'
include/linux/i8042.h:49: note: previous definition of 'i8042_unlock_chip' was here
drivers/input/serio/i8042.c:246: error: redefinition of 'i8042_command'
include/linux/i8042.h:53: note: previous definition of 'i8042_command' was here
drivers/input/serio/i8042.c:1193: error: redefinition of 'i8042_check_port_owner'
include/linux/i8042.h:58: note: previous definition of 'i8042_check_port_owner' was here
Caused by commit 1f57f19e6245c5534c3518a8455419461ec06778 ("Input: libps2
- additional locking for i8042 ports").
Please, if you add code that depends on a CONFIG option, build it with
and without the options set ...
I have used the input-current tree from next-20090916 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
* linux-next: manual merge of the tty.current tree with the net-current tree
From: Stephen Rothwell @ 2009-09-17 0:54 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Wolfram Sang, Ken Kawasaki,
David S. Miller
Hi Greg,
Today's linux-next merge of the tty.current tree got a conflict in
drivers/serial/serial_cs.c between commit
531afd64d027e3d798c416b2b37b3cfb1de417d9 ("pcnet_cs: add cis of Linksys
multifunction pcmcia card") from the net-current tree and commit
5cea4a4e15a918f19d32fd3dc9a5056f333847c3 ("tty: serial/pcmcia: add ID for
Advantech card") from the tty.current tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/serial/serial_cs.c
index ed4648b,6ecb51b..0000000
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@@ -883,10 -883,11 +883,11 @@@ static struct pcmcia_device_id serial_i
PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0x0710, "SW_7xx_SER.cis"), /* Sierra Wireless AC710/AC750 GPRS Network Adapter R1 */
PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
- PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "MT5634ZLX.cis"),
+ PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "cis/MT5634ZLX.cis"),
+ PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "COMpad2.cis"),
PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"),
PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),
- PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "RS-COM-2P.cis"),
+ PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),
PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "GLOBETROTTER.cis"),
PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100 1.00.",0x19ca78af,0xf964f42b),
PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83),
^ permalink raw reply
* Re: [PATCH] edac: need to export cpu_llc_id
From: Stephen Rothwell @ 2009-09-17 0:35 UTC (permalink / raw)
To: Borislav Petkov
Cc: Linus, Andrew Morton, linux-next, linux-kernel, x86,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin
In-Reply-To: <20090916160420.GA12585@aftab>
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
Hi Boris,
On Wed, 16 Sep 2009 18:04:20 +0200 Borislav Petkov <borislav.petkov@amd.com> wrote:
>
> By the way, fix is already underway to Linus so you might just wait
> a while before applying it to your linux-next mix and pull it from
> upstream instead.
Since Linus hasn't merged your tree yet, I have cherry-picked that one
commit from your tree into my "fixes" tree for today. I will drop it
when Linus takes your tree.
Thanks.
--
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] edac: need to export cpu_llc_id
From: Borislav Petkov @ 2009-09-16 16:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus, Andrew Morton, linux-next, linux-kernel, x86,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin
In-Reply-To: <20090917014901.1011949d.sfr@canb.auug.org.au>
On Thu, Sep 17, 2009 at 01:49:01AM +1000, Stephen Rothwell wrote:
> Hi Boris,
>
> On Wed, 16 Sep 2009 06:41:51 +0200 Borislav Petkov <borislav.petkov@amd.com> wrote:
> >
> > proper fix is at http://marc.info/?l=linux-kernel&m=125302459621925
>
> Great, thanks.
By the way, fix is already underway to Linus so you might just wait
a while before applying it to your linux-next mix and pull it from
upstream instead.
--
Regards/Gruss,
Boris.
Operating | Advanced Micro Devices GmbH
System | Karl-Hammerschmidt-Str. 34, 85609 Dornach b. München, Germany
Research | Geschäftsführer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni
Center | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
(OSRC) | Registergericht München, HRB Nr. 43632
^ permalink raw reply
* Re: [PATCH] edac: need to export cpu_llc_id
From: Stephen Rothwell @ 2009-09-16 15:49 UTC (permalink / raw)
To: Borislav Petkov
Cc: Linus, Andrew Morton, linux-next, linux-kernel, x86,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin
In-Reply-To: <20090916044151.GB5767@aftab>
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
Hi Boris,
On Wed, 16 Sep 2009 06:41:51 +0200 Borislav Petkov <borislav.petkov@amd.com> wrote:
>
> proper fix is at http://marc.info/?l=linux-kernel&m=125302459621925
Great, thanks.
--
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
* linux-next: Tree for September 16
From: Stephen Rothwell @ 2009-09-16 5:57 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7925 bytes --]
Hi all,
Please do not add code destined for 2.6.33 into linux-next trees until
(at least) 2.6.32-rc1 is out. This will hopefully give those who have
stuff destined for just after -rc1 a chance.
Changes since 20090915:
We are seeing conflicts move from one tree to another as Linus merges
them.
Linus' tree gained a build failure for which I applied a patch.
The rr tree still has a build failure so I used the version from
next-20090908.
The drbd tree lost its build failure.
The staging tree lost its conflicts.
----------------------------------------------------------------------------
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 140 trees (counting Linus' and 21 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 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
Applying: edac: need to export cpu_llc_id
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
CONFLICT (add/add): Merge conflict in arch/arm/include/asm/unified.h
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
CONFLICT (content): Merge conflict in kernel/gcov/Kconfig
Merging mips/mips-for-linux-next
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/signal.c
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
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
CONFLICT (content): Merge conflict in fs/ubifs/super.c
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_lrw.c
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/powerpc/kernel/pci_64.c
Applying: pci: merge fixup for fundamental reset conflict with powerpc tree
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/sh_mobile_ceu_camera.c
Merging quota/for_next
Merging kbuild/master
CONFLICT (content): Merge conflict in scripts/extract-ikconfig
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in drivers/acpi/power.c
CONFLICT (content): Merge conflict in drivers/pci/dmar.c
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
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in kernel/module.c
$ git reset --hard HEAD^
Merging refs/next/20090908/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging mmc/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
CONFLICT (content): Merge conflict in drivers/power/wm97xx_battery.c
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
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in firmware/Makefile
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
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
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
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/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Applying: tip: fix merge for cupmask update
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/class.c
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in drivers/scsi/Makefile
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: [PATCH] edac: need to export cpu_llc_id
From: Borislav Petkov @ 2009-09-16 4:58 UTC (permalink / raw)
To: H. Peter Anvin
Cc: Stephen Rothwell, Linus, Andrew Morton, linux-next, linux-kernel,
x86, Thomas Gleixner, Ingo Molnar
In-Reply-To: <4AB06EE3.4010509@zytor.com>
On Tue, Sep 15, 2009 at 09:51:47PM -0700, H. Peter Anvin wrote:
> On 09/15/2009 09:41 PM, Borislav Petkov wrote:
> >
> > proper fix is at http://marc.info/?l=linux-kernel&m=125302459621925
> >
> > we still have to figure out who's gonna pick it up. Ingo?
> >
>
> This was from a tree you pushed straight to Linus, so it's probably
> better you push it directly.
>
> You can add:
>
> Acked-by: H. Peter Anvin <hpa@zytor.com>
Cool, thanks. Will prep a pull request in a couple of hours.
--
Regards/Gruss,
Boris.
Operating | Advanced Micro Devices GmbH
System | Karl-Hammerschmidt-Str. 34, 85609 Dornach b. München, Germany
Research | Geschäftsführer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni
Center | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
(OSRC) | Registergericht München, HRB Nr. 43632
^ permalink raw reply
* Re: [PATCH] edac: need to export cpu_llc_id
From: H. Peter Anvin @ 2009-09-16 4:51 UTC (permalink / raw)
To: Borislav Petkov
Cc: Stephen Rothwell, Linus, Andrew Morton, linux-next, linux-kernel,
x86, Thomas Gleixner, Ingo Molnar
In-Reply-To: <20090916044151.GB5767@aftab>
On 09/15/2009 09:41 PM, Borislav Petkov wrote:
>
> proper fix is at http://marc.info/?l=linux-kernel&m=125302459621925
>
> we still have to figure out who's gonna pick it up. Ingo?
>
This was from a tree you pushed straight to Linus, so it's probably
better you push it directly.
You can add:
Acked-by: H. Peter Anvin <hpa@zytor.com>
-hpa
--
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel. I don't speak on their behalf.
^ permalink raw reply
* Re: [PATCH] edac: need to export cpu_llc_id
From: Borislav Petkov @ 2009-09-16 4:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus, Andrew Morton, linux-next, linux-kernel, x86,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin
In-Reply-To: <20090916093935.6bc2c91f.sfr@canb.auug.org.au>
Hi Stephen,
On Wed, Sep 16, 2009 at 09:39:35AM +1000, Stephen Rothwell wrote:
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> ERROR: "per_cpu__cpu_llc_id" [drivers/edac/edac_core.ko] undefined!
>
> Caused by commit b69b29de65fe4078b125acc9dea34be82f7c362c ("EDAC, AMD:
> carve out MCi_STATUS decoding").
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/x86/kernel/smpboot.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
> index a25eeec..04c74b4 100644
> --- a/arch/x86/kernel/smpboot.c
> +++ b/arch/x86/kernel/smpboot.c
> @@ -100,6 +100,7 @@ EXPORT_SYMBOL(smp_num_siblings);
>
> /* Last level cache ID of each logical CPU */
> DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;
> +EXPORT_PER_CPU_SYMBOL(cpu_llc_id);
>
> /* representing HT siblings of each logical CPU */
> DEFINE_PER_CPU(cpumask_var_t, cpu_sibling_map);
> --
> 1.6.3.3
proper fix is at http://marc.info/?l=linux-kernel&m=125302459621925
we still have to figure out who's gonna pick it up. Ingo?
--
Regards/Gruss,
Boris.
Operating | Advanced Micro Devices GmbH
System | Karl-Hammerschmidt-Str. 34, 85609 Dornach b. München, Germany
Research | Geschäftsführer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni
Center | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
(OSRC) | Registergericht München, HRB Nr. 43632
^ permalink raw reply
* Re: [linux-next PATCH] MAINTAINERS: Generic UIO use M: "Michael S. Tsirkin" <mst@redhat.com>
From: Joe Perches @ 2009-09-16 2:20 UTC (permalink / raw)
To: Greg KH; +Cc: Michael S. Tsirkin, linux-next, Andrew Morton
In-Reply-To: <20090915183544.GA32688@kroah.com>
On Tue, 2009-09-15 at 11:35 -0700, Greg KH wrote:
> On Tue, Sep 15, 2009 at 11:34:27AM -0700, Joe Perches wrote:
> > Could you also take out the "L: linux-kernel@vger..." entry.
> > It's not necessary.
> Care to send me a patch removing that? I'll queue it up for the next
> round to go off. Or you can send it if you have MAINTAINERS file
> updates as well.
> sorry about that.
No worries. MAINTAINERS patches aren't exactly life critical...
I'll send patches via Andrew Morton after RC1 is out.
cheers, Joe
^ permalink raw reply
* [PATCH] edac: need to export cpu_llc_id
From: Stephen Rothwell @ 2009-09-15 23:39 UTC (permalink / raw)
To: Linus, Andrew Morton
Cc: linux-next, linux-kernel, Borislav Petkov, x86, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin
Today's linux-next build (x86_64 allmodconfig) failed like this:
ERROR: "per_cpu__cpu_llc_id" [drivers/edac/edac_core.ko] undefined!
Caused by commit b69b29de65fe4078b125acc9dea34be82f7c362c ("EDAC, AMD:
carve out MCi_STATUS decoding").
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/x86/kernel/smpboot.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index a25eeec..04c74b4 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -100,6 +100,7 @@ EXPORT_SYMBOL(smp_num_siblings);
/* Last level cache ID of each logical CPU */
DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;
+EXPORT_PER_CPU_SYMBOL(cpu_llc_id);
/* representing HT siblings of each logical CPU */
DEFINE_PER_CPU(cpumask_var_t, cpu_sibling_map);
--
1.6.3.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* Re: [PATCHv2] qla2xxx: Correct compilation issues when CONFIG_MOUDLES=n.
From: Andrew Vasquez @ 2009-09-15 21:57 UTC (permalink / raw)
To: Kay Sievers
Cc: Greg KH, James Bottomley, Linux SCSI Mailing List, Randy Dunlap,
Stephen Rothwell, linux-next@vger.kernel.org, LKML,
Giridhar Malavali, Ravi Anand, Lalit Chandivade
In-Reply-To: <ac3eb2510909151022s5a0704c2xd4be73d5c63ab0f1@mail.gmail.com>
On Tue, 15 Sep 2009, Kay Sievers wrote:
> On Tue, Sep 15, 2009 at 18:57, Greg KH <greg@kroah.com> wrote:
> > On Tue, Sep 15, 2009 at 10:47:11AM -0500, James Bottomley wrote:
> >> On Tue, 2009-09-15 at 08:33 -0700, Greg KH wrote:
> >> > On Sat, Sep 12, 2009 at 09:30:07AM -0500, James Bottomley wrote:
> >> > > On Fri, 2009-09-11 at 21:33 -0700, Greg KH wrote:
> >> > > > On Fri, Sep 11, 2009 at 07:56:23PM -0700, Andrew Vasquez wrote:
> >> > > > > On Fri, 11 Sep 2009, Greg KH wrote:
> >> > > > >
> >> > > > > > On Fri, Sep 11, 2009 at 05:38:08PM -0700, Andrew Vasquez wrote:
> >> > > > > > > Randy Dunlap noted:
> >> > > > > > >
> >> > > > > > > when CONFIG_MODULES=n:
> >> > > > > > >
> >> > > > > > > drivers/scsi/qla2xxx/qla_os.c:2685: error: dereferencing pointer to incomplete type
> >> > > > > > >
> >> > > > > > > in
> >> > > > > > >
> >> > > > > > > kobject_uevent_env(&(&vha->hw->pdev->driver->driver)->owner->mkobj.kobj,
> >> > > > > > > KOBJ_CHANGE, envp);
> >> > > > > > >
> >> > > > > > > Trigger kobject event on the 'struct device' hanging off the pci_dev.
> >> > > > > >
> >> > > > > > Um, why? What are you trying to do here? kobject change should not be
> >> > > > > > for a device, or a "normal" kobject.
> >> > > > > >
> >> > > > > > What do you expect userspace to do with this? Where have you documented
> >> > > > > > it?
> >> > > > >
> >> > > > > The purpose was described here:
> >> > > > >
> >> > > > > http://article.gmane.org/gmane.linux.scsi/54155
> >> > > > >
> >> > > > > Basically we'd like to instruct user-space to retrieve a blob of data
> >> > > > > automatically.
> >> > > >
> >> > > > Hm, like a firmware object perhaps?
> >> > > >
> >> > > > > Original implementation used the kboject hanging off
> >> > > > > the module which does not exist when CONFIG_MODULES=n. It was
> >> > > > > suggested that perhaps an alternative would be to use 'struct device'
> >> > > > > kobj. Any tips on how to trigger such a driver-specific event,
> >> > > > > perhaps a dedicated kobject exported by the driver itself???
> >> > > >
> >> > > > Why not use the firmware interface for it, that is what it is designed
> >> > > > for, and you will not have to craft any new udev rules.
> >> > >
> >> > > The data is going the wrong way to use the current firmware interface,
> >> > > which is designed to load data from userspace into the kernel. For this
> >> > > interface, we want the data to go the other way (i.e. the kernel has a
> >> > > blob of dump data it would like userspace to save if it can).
> >> >
> >> > Ick.
> >>
> >> It's a natural debugging event ... the user can simply program the
> >> system to discard the dump.
> >>
> >> > > I'd be amenable to updating the firmware interface to do this, but it
> >> > > looks like adding a completely new codepath, which it's not clear even
> >> > > belongs there.
> >> >
> >> > Well, I don't think it deserves a kobject change event, as that means
> >> > something a bit different to userspace today, right?
> >>
> >> Well, the documentation (in include/linux/kobject.h) does say that
> >> KOBJ_CHANGED is the dumping ground for events that don't match anything
> >> else, which this one seems to qualify as. What else do you suggest?
> >
> > Ok, I can't think of anything else at the moment, sorry.
>
> Wouldn't kernel/kmod.c :: call_usermodehelper_pipe() somehow fit for
> that interface?
The only current consumer of call_usermodehelper_pipe() is
fs/exec.c::do_coredump() and it appears to manipulate the blob of data
via file-level operations. Would this be a 'notification'
alternative? Or, are you suggesting the whole process be redone (both
notification and blob-transfer)? Uevent notifications with a udev
user-space front-end appears to be a much more simplified and flexible
mechanism.
-- av
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [linux-next PATCH] MAINTAINERS: Generic UIO use M: "Michael S. Tsirkin" <mst@redhat.com>
From: Greg KH @ 2009-09-15 18:35 UTC (permalink / raw)
To: Joe Perches; +Cc: Michael S. Tsirkin, linux-next, Andrew Morton
In-Reply-To: <1253039667.7215.11.camel@Joe-Laptop.home>
On Tue, Sep 15, 2009 at 11:34:27AM -0700, Joe Perches wrote:
> On Tue, 2009-09-15 at 08:32 -0700, Greg KH wrote:
> > > GENERIC UIO DRIVER FOR PCI DEVICES
> > > -P: Michael S. Tsirkin <mst@redhat.com>
> > > +M: "Michael S. Tsirkin" <mst@redhat.com>
> >
> > I will edit the patch in my tree that causes this to happen.
>
> Could you also take out the "L: linux-kernel@vger..." entry.
> It's not necessary.
Argh, I just sent it off to Linus :(
Care to send me a patch removing that? I'll queue it up for the next
round to go off. Or you can send it if you have MAINTAINERS file
updates as well.
sorry about that.
greg k-h
^ permalink raw reply
* Re: [PATCHv2] qla2xxx: Correct compilation issues when CONFIG_MOUDLES=n.
From: Greg KH @ 2009-09-15 18:29 UTC (permalink / raw)
To: Kay Sievers
Cc: James Bottomley, Andrew Vasquez, Linux SCSI Mailing List,
Randy Dunlap, Stephen Rothwell, linux-next@vger.kernel.org, LKML,
Giridhar Malavali, Ravi Anand, Lalit Chandivade
In-Reply-To: <ac3eb2510909151022s5a0704c2xd4be73d5c63ab0f1@mail.gmail.com>
On Tue, Sep 15, 2009 at 07:22:03PM +0200, Kay Sievers wrote:
> On Tue, Sep 15, 2009 at 18:57, Greg KH <greg@kroah.com> wrote:
> > On Tue, Sep 15, 2009 at 10:47:11AM -0500, James Bottomley wrote:
> >> On Tue, 2009-09-15 at 08:33 -0700, Greg KH wrote:
> >> > On Sat, Sep 12, 2009 at 09:30:07AM -0500, James Bottomley wrote:
> >> > > On Fri, 2009-09-11 at 21:33 -0700, Greg KH wrote:
> >> > > > On Fri, Sep 11, 2009 at 07:56:23PM -0700, Andrew Vasquez wrote:
> >> > > > > On Fri, 11 Sep 2009, Greg KH wrote:
> >> > > > >
> >> > > > > > On Fri, Sep 11, 2009 at 05:38:08PM -0700, Andrew Vasquez wrote:
> >> > > > > > > Randy Dunlap noted:
> >> > > > > > >
> >> > > > > > > when CONFIG_MODULES=n:
> >> > > > > > >
> >> > > > > > > drivers/scsi/qla2xxx/qla_os.c:2685: error: dereferencing pointer to incomplete type
> >> > > > > > >
> >> > > > > > > in
> >> > > > > > >
> >> > > > > > > kobject_uevent_env(&(&vha->hw->pdev->driver->driver)->owner->mkobj.kobj,
> >> > > > > > > KOBJ_CHANGE, envp);
> >> > > > > > >
> >> > > > > > > Trigger kobject event on the 'struct device' hanging off the pci_dev.
> >> > > > > >
> >> > > > > > Um, why? What are you trying to do here? kobject change should not be
> >> > > > > > for a device, or a "normal" kobject.
> >> > > > > >
> >> > > > > > What do you expect userspace to do with this? Where have you documented
> >> > > > > > it?
> >> > > > >
> >> > > > > The purpose was described here:
> >> > > > >
> >> > > > > http://article.gmane.org/gmane.linux.scsi/54155
> >> > > > >
> >> > > > > Basically we'd like to instruct user-space to retrieve a blob of data
> >> > > > > automatically.
> >> > > >
> >> > > > Hm, like a firmware object perhaps?
> >> > > >
> >> > > > > Original implementation used the kboject hanging off
> >> > > > > the module which does not exist when CONFIG_MODULES=n. It was
> >> > > > > suggested that perhaps an alternative would be to use 'struct device'
> >> > > > > kobj. Any tips on how to trigger such a driver-specific event,
> >> > > > > perhaps a dedicated kobject exported by the driver itself???
> >> > > >
> >> > > > Why not use the firmware interface for it, that is what it is designed
> >> > > > for, and you will not have to craft any new udev rules.
> >> > >
> >> > > The data is going the wrong way to use the current firmware interface,
> >> > > which is designed to load data from userspace into the kernel. For this
> >> > > interface, we want the data to go the other way (i.e. the kernel has a
> >> > > blob of dump data it would like userspace to save if it can).
> >> >
> >> > Ick.
> >>
> >> It's a natural debugging event ... the user can simply program the
> >> system to discard the dump.
> >>
> >> > > I'd be amenable to updating the firmware interface to do this, but it
> >> > > looks like adding a completely new codepath, which it's not clear even
> >> > > belongs there.
> >> >
> >> > Well, I don't think it deserves a kobject change event, as that means
> >> > something a bit different to userspace today, right?
> >>
> >> Well, the documentation (in include/linux/kobject.h) does say that
> >> KOBJ_CHANGED is the dumping ground for events that don't match anything
> >> else, which this one seems to qualify as. What else do you suggest?
> >
> > Ok, I can't think of anything else at the moment, sorry.
>
> Wouldn't kernel/kmod.c :: call_usermodehelper_pipe() somehow fit for
> that interface?
Ah, yeah, good idea. Anyone tried that?
thanks,
greg k-h
^ permalink raw reply
* Re: [linux-next PATCH] MAINTAINERS: Generic UIO use M: "Michael S. Tsirkin" <mst@redhat.com>
From: Joe Perches @ 2009-09-15 18:34 UTC (permalink / raw)
To: Greg KH; +Cc: Michael S. Tsirkin, linux-next, Andrew Morton
In-Reply-To: <20090915153204.GA22774@kroah.com>
On Tue, 2009-09-15 at 08:32 -0700, Greg KH wrote:
> > GENERIC UIO DRIVER FOR PCI DEVICES
> > -P: Michael S. Tsirkin <mst@redhat.com>
> > +M: "Michael S. Tsirkin" <mst@redhat.com>
>
> I will edit the patch in my tree that causes this to happen.
Could you also take out the "L: linux-kernel@vger..." entry.
It's not necessary.
cheers, Joe
^ permalink raw reply
* Re: [PATCHv2] qla2xxx: Correct compilation issues when CONFIG_MOUDLES=n.
From: Andrew Vasquez @ 2009-09-15 18:26 UTC (permalink / raw)
To: Greg KH
Cc: James Bottomley, Linux SCSI Mailing List, Randy Dunlap,
Stephen Rothwell, linux-next@vger.kernel.org, LKML,
Giridhar Malavali, Ravi Anand, Lalit Chandivade
In-Reply-To: <20090915165708.GA18817@kroah.com>
On Tue, 15 Sep 2009, Greg KH wrote:
> On Tue, Sep 15, 2009 at 10:47:11AM -0500, James Bottomley wrote:
> > On Tue, 2009-09-15 at 08:33 -0700, Greg KH wrote:
> > > On Sat, Sep 12, 2009 at 09:30:07AM -0500, James Bottomley wrote:
> > > > On Fri, 2009-09-11 at 21:33 -0700, Greg KH wrote:
> > > > > On Fri, Sep 11, 2009 at 07:56:23PM -0700, Andrew Vasquez wrote:
> > > > > > On Fri, 11 Sep 2009, Greg KH wrote:
> > > > > >
> > > > > > > On Fri, Sep 11, 2009 at 05:38:08PM -0700, Andrew Vasquez wrote:
> > > > > > > > Randy Dunlap noted:
> > > > > > > >
> > > > > > > > when CONFIG_MODULES=n:
> > > > > > > >
> > > > > > > > drivers/scsi/qla2xxx/qla_os.c:2685: error: dereferencing pointer to incomplete type
> > > > > > > >
> > > > > > > > in
> > > > > > > >
> > > > > > > > kobject_uevent_env(&(&vha->hw->pdev->driver->driver)->owner->mkobj.kobj,
> > > > > > > > KOBJ_CHANGE, envp);
> > > > > > > >
> > > > > > > > Trigger kobject event on the 'struct device' hanging off the pci_dev.
> > > > > > >
> > > > > > > Um, why? What are you trying to do here? kobject change should not be
> > > > > > > for a device, or a "normal" kobject.
> > > > > > >
> > > > > > > What do you expect userspace to do with this? Where have you documented
> > > > > > > it?
> > > > > >
> > > > > > The purpose was described here:
> > > > > >
> > > > > > http://article.gmane.org/gmane.linux.scsi/54155
> > > > > >
> > > > > > Basically we'd like to instruct user-space to retrieve a blob of data
> > > > > > automatically.
> > > > >
> > > > > Hm, like a firmware object perhaps?
> > > > >
> > > > > > Original implementation used the kboject hanging off
> > > > > > the module which does not exist when CONFIG_MODULES=n. It was
> > > > > > suggested that perhaps an alternative would be to use 'struct device'
> > > > > > kobj. Any tips on how to trigger such a driver-specific event,
> > > > > > perhaps a dedicated kobject exported by the driver itself???
> > > > >
> > > > > Why not use the firmware interface for it, that is what it is designed
> > > > > for, and you will not have to craft any new udev rules.
> > > >
> > > > The data is going the wrong way to use the current firmware interface,
> > > > which is designed to load data from userspace into the kernel. For this
> > > > interface, we want the data to go the other way (i.e. the kernel has a
> > > > blob of dump data it would like userspace to save if it can).
> > >
> > > Ick.
> >
> > It's a natural debugging event ... the user can simply program the
> > system to discard the dump.
> >
> > > > I'd be amenable to updating the firmware interface to do this, but it
> > > > looks like adding a completely new codepath, which it's not clear even
> > > > belongs there.
> > >
> > > Well, I don't think it deserves a kobject change event, as that means
> > > something a bit different to userspace today, right?
> >
> > Well, the documentation (in include/linux/kobject.h) does say that
> > KOBJ_CHANGED is the dumping ground for events that don't match anything
> > else, which this one seems to qualify as. What else do you suggest?
>
> Ok, I can't think of anything else at the moment, sorry.
>
> This is using a binary sysfs file, right?
Yes, the userspace tool retrieves the dump from a binary sysfs node:
/sys/class/scsi_host/hostX/device/fw_dump
-- AV
^ permalink raw reply
* Re: [PATCHv2] qla2xxx: Correct compilation issues when CONFIG_MOUDLES=n.
From: Kay Sievers @ 2009-09-15 17:22 UTC (permalink / raw)
To: Greg KH
Cc: James Bottomley, Andrew Vasquez, Linux SCSI Mailing List,
Randy Dunlap, Stephen Rothwell, linux-next@vger.kernel.org, LKML,
Giridhar Malavali, Ravi Anand, Lalit Chandivade
In-Reply-To: <20090915165708.GA18817@kroah.com>
On Tue, Sep 15, 2009 at 18:57, Greg KH <greg@kroah.com> wrote:
> On Tue, Sep 15, 2009 at 10:47:11AM -0500, James Bottomley wrote:
>> On Tue, 2009-09-15 at 08:33 -0700, Greg KH wrote:
>> > On Sat, Sep 12, 2009 at 09:30:07AM -0500, James Bottomley wrote:
>> > > On Fri, 2009-09-11 at 21:33 -0700, Greg KH wrote:
>> > > > On Fri, Sep 11, 2009 at 07:56:23PM -0700, Andrew Vasquez wrote:
>> > > > > On Fri, 11 Sep 2009, Greg KH wrote:
>> > > > >
>> > > > > > On Fri, Sep 11, 2009 at 05:38:08PM -0700, Andrew Vasquez wrote:
>> > > > > > > Randy Dunlap noted:
>> > > > > > >
>> > > > > > > when CONFIG_MODULES=n:
>> > > > > > >
>> > > > > > > drivers/scsi/qla2xxx/qla_os.c:2685: error: dereferencing pointer to incomplete type
>> > > > > > >
>> > > > > > > in
>> > > > > > >
>> > > > > > > kobject_uevent_env(&(&vha->hw->pdev->driver->driver)->owner->mkobj.kobj,
>> > > > > > > KOBJ_CHANGE, envp);
>> > > > > > >
>> > > > > > > Trigger kobject event on the 'struct device' hanging off the pci_dev.
>> > > > > >
>> > > > > > Um, why? What are you trying to do here? kobject change should not be
>> > > > > > for a device, or a "normal" kobject.
>> > > > > >
>> > > > > > What do you expect userspace to do with this? Where have you documented
>> > > > > > it?
>> > > > >
>> > > > > The purpose was described here:
>> > > > >
>> > > > > http://article.gmane.org/gmane.linux.scsi/54155
>> > > > >
>> > > > > Basically we'd like to instruct user-space to retrieve a blob of data
>> > > > > automatically.
>> > > >
>> > > > Hm, like a firmware object perhaps?
>> > > >
>> > > > > Original implementation used the kboject hanging off
>> > > > > the module which does not exist when CONFIG_MODULES=n. It was
>> > > > > suggested that perhaps an alternative would be to use 'struct device'
>> > > > > kobj. Any tips on how to trigger such a driver-specific event,
>> > > > > perhaps a dedicated kobject exported by the driver itself???
>> > > >
>> > > > Why not use the firmware interface for it, that is what it is designed
>> > > > for, and you will not have to craft any new udev rules.
>> > >
>> > > The data is going the wrong way to use the current firmware interface,
>> > > which is designed to load data from userspace into the kernel. For this
>> > > interface, we want the data to go the other way (i.e. the kernel has a
>> > > blob of dump data it would like userspace to save if it can).
>> >
>> > Ick.
>>
>> It's a natural debugging event ... the user can simply program the
>> system to discard the dump.
>>
>> > > I'd be amenable to updating the firmware interface to do this, but it
>> > > looks like adding a completely new codepath, which it's not clear even
>> > > belongs there.
>> >
>> > Well, I don't think it deserves a kobject change event, as that means
>> > something a bit different to userspace today, right?
>>
>> Well, the documentation (in include/linux/kobject.h) does say that
>> KOBJ_CHANGED is the dumping ground for events that don't match anything
>> else, which this one seems to qualify as. What else do you suggest?
>
> Ok, I can't think of anything else at the moment, sorry.
Wouldn't kernel/kmod.c :: call_usermodehelper_pipe() somehow fit for
that interface?
Kay
^ permalink raw reply
* Re: [PATCHv2] qla2xxx: Correct compilation issues when CONFIG_MOUDLES=n.
From: Greg KH @ 2009-09-15 16:57 UTC (permalink / raw)
To: James Bottomley
Cc: Andrew Vasquez, Linux SCSI Mailing List, Randy Dunlap,
Stephen Rothwell, linux-next@vger.kernel.org, LKML,
Giridhar Malavali, Ravi Anand, Lalit Chandivade
In-Reply-To: <1253029631.29947.156.camel@mulgrave.site>
On Tue, Sep 15, 2009 at 10:47:11AM -0500, James Bottomley wrote:
> On Tue, 2009-09-15 at 08:33 -0700, Greg KH wrote:
> > On Sat, Sep 12, 2009 at 09:30:07AM -0500, James Bottomley wrote:
> > > On Fri, 2009-09-11 at 21:33 -0700, Greg KH wrote:
> > > > On Fri, Sep 11, 2009 at 07:56:23PM -0700, Andrew Vasquez wrote:
> > > > > On Fri, 11 Sep 2009, Greg KH wrote:
> > > > >
> > > > > > On Fri, Sep 11, 2009 at 05:38:08PM -0700, Andrew Vasquez wrote:
> > > > > > > Randy Dunlap noted:
> > > > > > >
> > > > > > > when CONFIG_MODULES=n:
> > > > > > >
> > > > > > > drivers/scsi/qla2xxx/qla_os.c:2685: error: dereferencing pointer to incomplete type
> > > > > > >
> > > > > > > in
> > > > > > >
> > > > > > > kobject_uevent_env(&(&vha->hw->pdev->driver->driver)->owner->mkobj.kobj,
> > > > > > > KOBJ_CHANGE, envp);
> > > > > > >
> > > > > > > Trigger kobject event on the 'struct device' hanging off the pci_dev.
> > > > > >
> > > > > > Um, why? What are you trying to do here? kobject change should not be
> > > > > > for a device, or a "normal" kobject.
> > > > > >
> > > > > > What do you expect userspace to do with this? Where have you documented
> > > > > > it?
> > > > >
> > > > > The purpose was described here:
> > > > >
> > > > > http://article.gmane.org/gmane.linux.scsi/54155
> > > > >
> > > > > Basically we'd like to instruct user-space to retrieve a blob of data
> > > > > automatically.
> > > >
> > > > Hm, like a firmware object perhaps?
> > > >
> > > > > Original implementation used the kboject hanging off
> > > > > the module which does not exist when CONFIG_MODULES=n. It was
> > > > > suggested that perhaps an alternative would be to use 'struct device'
> > > > > kobj. Any tips on how to trigger such a driver-specific event,
> > > > > perhaps a dedicated kobject exported by the driver itself???
> > > >
> > > > Why not use the firmware interface for it, that is what it is designed
> > > > for, and you will not have to craft any new udev rules.
> > >
> > > The data is going the wrong way to use the current firmware interface,
> > > which is designed to load data from userspace into the kernel. For this
> > > interface, we want the data to go the other way (i.e. the kernel has a
> > > blob of dump data it would like userspace to save if it can).
> >
> > Ick.
>
> It's a natural debugging event ... the user can simply program the
> system to discard the dump.
>
> > > I'd be amenable to updating the firmware interface to do this, but it
> > > looks like adding a completely new codepath, which it's not clear even
> > > belongs there.
> >
> > Well, I don't think it deserves a kobject change event, as that means
> > something a bit different to userspace today, right?
>
> Well, the documentation (in include/linux/kobject.h) does say that
> KOBJ_CHANGED is the dumping ground for events that don't match anything
> else, which this one seems to qualify as. What else do you suggest?
Ok, I can't think of anything else at the moment, sorry.
This is using a binary sysfs file, right?
thanks,
greg k-h
^ permalink raw reply
* [PATCHv4] qla2xxx: Add firmware-dump kobject uevent notification.
From: Andrew Vasquez @ 2009-09-15 16:44 UTC (permalink / raw)
To: James Bottomley
Cc: Greg KH, Linux SCSI Mailing List, Randy Dunlap, Stephen Rothwell,
linux-next@vger.kernel.org, LKML, Giridhar Malavali, Ravi Anand,
Lalit Chandivade
In-Reply-To: <1253029631.29947.156.camel@mulgrave.site>
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
---
On Tue, 15 Sep 2009, James Bottomley wrote:
> On Tue, 2009-09-15 at 08:33 -0700, Greg KH wrote:
> > On Sat, Sep 12, 2009 at 09:30:07AM -0500, James Bottomley wrote:
> > > On Fri, 2009-09-11 at 21:33 -0700, Greg KH wrote:
> > > > On Fri, Sep 11, 2009 at 07:56:23PM -0700, Andrew Vasquez wrote:
> > > > > On Fri, 11 Sep 2009, Greg KH wrote:
> > > > >
> > > > > > On Fri, Sep 11, 2009 at 05:38:08PM -0700, Andrew Vasquez wrote:
> > > > > > > Randy Dunlap noted:
> > > > > > >
> > > > > > > when CONFIG_MODULES=n:
> > > > > > >
> > > > > > > drivers/scsi/qla2xxx/qla_os.c:2685: error: dereferencing pointer to incomplete type
> > > > > > >
> > > > > > > in
> > > > > > >
> > > > > > > kobject_uevent_env(&(&vha->hw->pdev->driver->driver)->owner->mkobj.kobj,
> > > > > > > KOBJ_CHANGE, envp);
> > > > > > >
> > > > > > > Trigger kobject event on the 'struct device' hanging off the pci_dev.
> > > > > >
> > > > > > Um, why? What are you trying to do here? kobject change should not be
> > > > > > for a device, or a "normal" kobject.
> > > > > >
> > > > > > What do you expect userspace to do with this? Where have you documented
> > > > > > it?
> > > > >
> > > > > The purpose was described here:
> > > > >
> > > > > http://article.gmane.org/gmane.linux.scsi/54155
> > > > >
> > > > > Basically we'd like to instruct user-space to retrieve a blob of data
> > > > > automatically.
> > > >
> > > > Hm, like a firmware object perhaps?
> > > >
> > > > > Original implementation used the kboject hanging off
> > > > > the module which does not exist when CONFIG_MODULES=n. It was
> > > > > suggested that perhaps an alternative would be to use 'struct device'
> > > > > kobj. Any tips on how to trigger such a driver-specific event,
> > > > > perhaps a dedicated kobject exported by the driver itself???
> > > >
> > > > Why not use the firmware interface for it, that is what it is designed
> > > > for, and you will not have to craft any new udev rules.
> > >
> > > The data is going the wrong way to use the current firmware interface,
> > > which is designed to load data from userspace into the kernel. For this
> > > interface, we want the data to go the other way (i.e. the kernel has a
> > > blob of dump data it would like userspace to save if it can).
> >
> > Ick.
>
> It's a natural debugging event ... the user can simply program the
> system to discard the dump.
>
> > > I'd be amenable to updating the firmware interface to do this, but it
> > > looks like adding a completely new codepath, which it's not clear even
> > > belongs there.
> >
> > Well, I don't think it deserves a kobject change event, as that means
> > something a bit different to userspace today, right?
>
> Well, the documentation (in include/linux/kobject.h) does say that
> KOBJ_CHANGED is the dumping ground for events that don't match anything
> else, which this one seems to qualify as. What else do you suggest?
>
> > Either way, I see no documentation being added to the Documentation/ABI/
> > directory describing what is happening here, that needs to be added at
> > the least.
>
> OK, we can add that in the next go around.
>
> Andrew, I actually dropped the patch (just this one, not the rest of the
> qla2xxx patches) from the tree, so we can work on updating this as a
> whole.
Ok, how about this squashed commit as a first stab at documenting the
ABI???
Thanks, AV
Documentation/ABI/stable/sysfs-driver-qla2xxx | 8 +++
drivers/scsi/qla2xxx/qla_dbg.c | 78 +++++++-----------------
drivers/scsi/qla2xxx/qla_def.h | 5 ++
drivers/scsi/qla2xxx/qla_gbl.h | 1 +
drivers/scsi/qla2xxx/qla_os.c | 35 +++++++++++
5 files changed, 72 insertions(+), 55 deletions(-)
create mode 100644 Documentation/ABI/stable/sysfs-driver-qla2xxx
diff --git a/Documentation/ABI/stable/sysfs-driver-qla2xxx b/Documentation/ABI/stable/sysfs-driver-qla2xxx
new file mode 100644
index 0000000..9a59d84
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-driver-qla2xxx
@@ -0,0 +1,8 @@
+What: /sys/bus/pci/drivers/qla2xxx/.../devices/*
+Date: September 2009
+Contact: QLogic Linux Driver <linux-driver@qlogic.com>
+Description: qla2xxx-udev.sh currently looks for uevent CHANGE events to
+ signal a firmware-dump has been generated by the driver and is
+ ready for retrieval.
+Users: qla2xxx-udev.sh. Proposed changes should be mailed to
+ linux-driver@qlogic.com
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index cca8e4a..cb2eca4 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -377,6 +377,24 @@ qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)
return ptr + sizeof(struct qla2xxx_mq_chain);
}
+static void
+qla2xxx_dump_post_process(scsi_qla_host_t *vha, int rval)
+{
+ struct qla_hw_data *ha = vha->hw;
+
+ if (rval != QLA_SUCCESS) {
+ qla_printk(KERN_WARNING, ha,
+ "Failed to dump firmware (%x)!!!\n", rval);
+ ha->fw_dumped = 0;
+ } else {
+ qla_printk(KERN_INFO, ha,
+ "Firmware dump saved to temp buffer (%ld/%p).\n",
+ vha->host_no, ha->fw_dump);
+ ha->fw_dumped = 1;
+ qla2x00_post_uevent_work(vha, QLA_UEVENT_CODE_FW_DUMP);
+ }
+}
+
/**
* qla2300_fw_dump() - Dumps binary data from the 2300 firmware.
* @ha: HA context
@@ -530,17 +548,7 @@ qla2300_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
if (rval == QLA_SUCCESS)
qla2xxx_copy_queues(ha, nxt);
- if (rval != QLA_SUCCESS) {
- qla_printk(KERN_WARNING, ha,
- "Failed to dump firmware (%x)!!!\n", rval);
- ha->fw_dumped = 0;
-
- } else {
- qla_printk(KERN_INFO, ha,
- "Firmware dump saved to temp buffer (%ld/%p).\n",
- base_vha->host_no, ha->fw_dump);
- ha->fw_dumped = 1;
- }
+ qla2xxx_dump_post_process(base_vha, rval);
qla2300_fw_dump_failed:
if (!hardware_locked)
@@ -737,17 +745,7 @@ qla2100_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
if (rval == QLA_SUCCESS)
qla2xxx_copy_queues(ha, &fw->risc_ram[cnt]);
- if (rval != QLA_SUCCESS) {
- qla_printk(KERN_WARNING, ha,
- "Failed to dump firmware (%x)!!!\n", rval);
- ha->fw_dumped = 0;
-
- } else {
- qla_printk(KERN_INFO, ha,
- "Firmware dump saved to temp buffer (%ld/%p).\n",
- base_vha->host_no, ha->fw_dump);
- ha->fw_dumped = 1;
- }
+ qla2xxx_dump_post_process(base_vha, rval);
qla2100_fw_dump_failed:
if (!hardware_locked)
@@ -984,17 +982,7 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
qla24xx_copy_eft(ha, nxt);
qla24xx_fw_dump_failed_0:
- if (rval != QLA_SUCCESS) {
- qla_printk(KERN_WARNING, ha,
- "Failed to dump firmware (%x)!!!\n", rval);
- ha->fw_dumped = 0;
-
- } else {
- qla_printk(KERN_INFO, ha,
- "Firmware dump saved to temp buffer (%ld/%p).\n",
- base_vha->host_no, ha->fw_dump);
- ha->fw_dumped = 1;
- }
+ qla2xxx_dump_post_process(base_vha, rval);
qla24xx_fw_dump_failed:
if (!hardware_locked)
@@ -1305,17 +1293,7 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
}
qla25xx_fw_dump_failed_0:
- if (rval != QLA_SUCCESS) {
- qla_printk(KERN_WARNING, ha,
- "Failed to dump firmware (%x)!!!\n", rval);
- ha->fw_dumped = 0;
-
- } else {
- qla_printk(KERN_INFO, ha,
- "Firmware dump saved to temp buffer (%ld/%p).\n",
- base_vha->host_no, ha->fw_dump);
- ha->fw_dumped = 1;
- }
+ qla2xxx_dump_post_process(base_vha, rval);
qla25xx_fw_dump_failed:
if (!hardware_locked)
@@ -1628,17 +1606,7 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
}
qla81xx_fw_dump_failed_0:
- if (rval != QLA_SUCCESS) {
- qla_printk(KERN_WARNING, ha,
- "Failed to dump firmware (%x)!!!\n", rval);
- ha->fw_dumped = 0;
-
- } else {
- qla_printk(KERN_INFO, ha,
- "Firmware dump saved to temp buffer (%ld/%p).\n",
- base_vha->host_no, ha->fw_dump);
- ha->fw_dumped = 1;
- }
+ qla2xxx_dump_post_process(base_vha, rval);
qla81xx_fw_dump_failed:
if (!hardware_locked)
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 2150618..d8ce310 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2123,6 +2123,7 @@ enum qla_work_type {
QLA_EVT_ASYNC_LOGIN_DONE,
QLA_EVT_ASYNC_LOGOUT,
QLA_EVT_ASYNC_LOGOUT_DONE,
+ QLA_EVT_UEVENT,
};
@@ -2146,6 +2147,10 @@ struct qla_work_evt {
#define QLA_LOGIO_LOGIN_RETRIED BIT_0
u16 data[2];
} logio;
+ struct {
+ u32 code;
+#define QLA_UEVENT_CODE_FW_DUMP 0
+ } uevent;
} u;
};
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index f3d1d1a..14e0562 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -92,6 +92,7 @@ extern int qla2x00_post_async_logout_work(struct scsi_qla_host *, fc_port_t *,
uint16_t *);
extern int qla2x00_post_async_logout_done_work(struct scsi_qla_host *,
fc_port_t *, uint16_t *);
+extern int qla2x00_post_uevent_work(struct scsi_qla_host *, u32);
extern int qla81xx_restart_mpi_firmware(scsi_qla_host_t *);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index b79fca7..ecf2a40 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -11,6 +11,7 @@
#include <linux/delay.h>
#include <linux/kthread.h>
#include <linux/mutex.h>
+#include <linux/kobject.h>
#include <scsi/scsi_tcq.h>
#include <scsi/scsicam.h>
@@ -2653,6 +2654,37 @@ qla2x00_post_async_work(login_done, QLA_EVT_ASYNC_LOGIN_DONE);
qla2x00_post_async_work(logout, QLA_EVT_ASYNC_LOGOUT);
qla2x00_post_async_work(logout_done, QLA_EVT_ASYNC_LOGOUT_DONE);
+int
+qla2x00_post_uevent_work(struct scsi_qla_host *vha, u32 code)
+{
+ struct qla_work_evt *e;
+
+ e = qla2x00_alloc_work(vha, QLA_EVT_UEVENT);
+ if (!e)
+ return QLA_FUNCTION_FAILED;
+
+ e->u.uevent.code = code;
+ return qla2x00_post_work(vha, e);
+}
+
+static void
+qla2x00_uevent_emit(struct scsi_qla_host *vha, u32 code)
+{
+ char event_string[40];
+ char *envp[] = { event_string, NULL };
+
+ switch (code) {
+ case QLA_UEVENT_CODE_FW_DUMP:
+ snprintf(event_string, sizeof(event_string), "FW_DUMP=%ld",
+ vha->host_no);
+ break;
+ default:
+ /* do nothing */
+ break;
+ }
+ kobject_uevent_env(&vha->hw->pdev->dev.kobj, KOBJ_CHANGE, envp);
+}
+
void
qla2x00_do_work(struct scsi_qla_host *vha)
{
@@ -2690,6 +2722,9 @@ qla2x00_do_work(struct scsi_qla_host *vha)
qla2x00_async_logout_done(vha, e->u.logio.fcport,
e->u.logio.data);
break;
+ case QLA_EVT_UEVENT:
+ qla2x00_uevent_emit(vha, e->u.uevent.code);
+ break;
}
if (e->flags & QLA_EVT_FLAG_FREE)
kfree(e);
--
1.6.5.rc0
^ permalink raw reply related
* Re: [PATCHv2] qla2xxx: Correct compilation issues when CONFIG_MOUDLES=n.
From: James Bottomley @ 2009-09-15 15:47 UTC (permalink / raw)
To: Greg KH
Cc: Andrew Vasquez, Linux SCSI Mailing List, Randy Dunlap,
Stephen Rothwell, linux-next@vger.kernel.org, LKML,
Giridhar Malavali, Ravi Anand, Lalit Chandivade
In-Reply-To: <20090915153312.GB22774@kroah.com>
On Tue, 2009-09-15 at 08:33 -0700, Greg KH wrote:
> On Sat, Sep 12, 2009 at 09:30:07AM -0500, James Bottomley wrote:
> > On Fri, 2009-09-11 at 21:33 -0700, Greg KH wrote:
> > > On Fri, Sep 11, 2009 at 07:56:23PM -0700, Andrew Vasquez wrote:
> > > > On Fri, 11 Sep 2009, Greg KH wrote:
> > > >
> > > > > On Fri, Sep 11, 2009 at 05:38:08PM -0700, Andrew Vasquez wrote:
> > > > > > Randy Dunlap noted:
> > > > > >
> > > > > > when CONFIG_MODULES=n:
> > > > > >
> > > > > > drivers/scsi/qla2xxx/qla_os.c:2685: error: dereferencing pointer to incomplete type
> > > > > >
> > > > > > in
> > > > > >
> > > > > > kobject_uevent_env(&(&vha->hw->pdev->driver->driver)->owner->mkobj.kobj,
> > > > > > KOBJ_CHANGE, envp);
> > > > > >
> > > > > > Trigger kobject event on the 'struct device' hanging off the pci_dev.
> > > > >
> > > > > Um, why? What are you trying to do here? kobject change should not be
> > > > > for a device, or a "normal" kobject.
> > > > >
> > > > > What do you expect userspace to do with this? Where have you documented
> > > > > it?
> > > >
> > > > The purpose was described here:
> > > >
> > > > http://article.gmane.org/gmane.linux.scsi/54155
> > > >
> > > > Basically we'd like to instruct user-space to retrieve a blob of data
> > > > automatically.
> > >
> > > Hm, like a firmware object perhaps?
> > >
> > > > Original implementation used the kboject hanging off
> > > > the module which does not exist when CONFIG_MODULES=n. It was
> > > > suggested that perhaps an alternative would be to use 'struct device'
> > > > kobj. Any tips on how to trigger such a driver-specific event,
> > > > perhaps a dedicated kobject exported by the driver itself???
> > >
> > > Why not use the firmware interface for it, that is what it is designed
> > > for, and you will not have to craft any new udev rules.
> >
> > The data is going the wrong way to use the current firmware interface,
> > which is designed to load data from userspace into the kernel. For this
> > interface, we want the data to go the other way (i.e. the kernel has a
> > blob of dump data it would like userspace to save if it can).
>
> Ick.
It's a natural debugging event ... the user can simply program the
system to discard the dump.
> > I'd be amenable to updating the firmware interface to do this, but it
> > looks like adding a completely new codepath, which it's not clear even
> > belongs there.
>
> Well, I don't think it deserves a kobject change event, as that means
> something a bit different to userspace today, right?
Well, the documentation (in include/linux/kobject.h) does say that
KOBJ_CHANGED is the dumping ground for events that don't match anything
else, which this one seems to qualify as. What else do you suggest?
> Either way, I see no documentation being added to the Documentation/ABI/
> directory describing what is happening here, that needs to be added at
> the least.
OK, we can add that in the next go around.
Andrew, I actually dropped the patch (just this one, not the rest of the
qla2xxx patches) from the tree, so we can work on updating this as a
whole.
James
^ permalink raw reply
* Re: [PATCHv2] qla2xxx: Correct compilation issues when CONFIG_MOUDLES=n.
From: Greg KH @ 2009-09-15 15:33 UTC (permalink / raw)
To: James Bottomley
Cc: Andrew Vasquez, Linux SCSI Mailing List, Randy Dunlap,
Stephen Rothwell, linux-next@vger.kernel.org, LKML,
Giridhar Malavali, Ravi Anand, Lalit Chandivade
In-Reply-To: <1252765807.4238.74.camel@mulgrave.site>
On Sat, Sep 12, 2009 at 09:30:07AM -0500, James Bottomley wrote:
> On Fri, 2009-09-11 at 21:33 -0700, Greg KH wrote:
> > On Fri, Sep 11, 2009 at 07:56:23PM -0700, Andrew Vasquez wrote:
> > > On Fri, 11 Sep 2009, Greg KH wrote:
> > >
> > > > On Fri, Sep 11, 2009 at 05:38:08PM -0700, Andrew Vasquez wrote:
> > > > > Randy Dunlap noted:
> > > > >
> > > > > when CONFIG_MODULES=n:
> > > > >
> > > > > drivers/scsi/qla2xxx/qla_os.c:2685: error: dereferencing pointer to incomplete type
> > > > >
> > > > > in
> > > > >
> > > > > kobject_uevent_env(&(&vha->hw->pdev->driver->driver)->owner->mkobj.kobj,
> > > > > KOBJ_CHANGE, envp);
> > > > >
> > > > > Trigger kobject event on the 'struct device' hanging off the pci_dev.
> > > >
> > > > Um, why? What are you trying to do here? kobject change should not be
> > > > for a device, or a "normal" kobject.
> > > >
> > > > What do you expect userspace to do with this? Where have you documented
> > > > it?
> > >
> > > The purpose was described here:
> > >
> > > http://article.gmane.org/gmane.linux.scsi/54155
> > >
> > > Basically we'd like to instruct user-space to retrieve a blob of data
> > > automatically.
> >
> > Hm, like a firmware object perhaps?
> >
> > > Original implementation used the kboject hanging off
> > > the module which does not exist when CONFIG_MODULES=n. It was
> > > suggested that perhaps an alternative would be to use 'struct device'
> > > kobj. Any tips on how to trigger such a driver-specific event,
> > > perhaps a dedicated kobject exported by the driver itself???
> >
> > Why not use the firmware interface for it, that is what it is designed
> > for, and you will not have to craft any new udev rules.
>
> The data is going the wrong way to use the current firmware interface,
> which is designed to load data from userspace into the kernel. For this
> interface, we want the data to go the other way (i.e. the kernel has a
> blob of dump data it would like userspace to save if it can).
Ick.
> I'd be amenable to updating the firmware interface to do this, but it
> looks like adding a completely new codepath, which it's not clear even
> belongs there.
Well, I don't think it deserves a kobject change event, as that means
something a bit different to userspace today, right?
Either way, I see no documentation being added to the Documentation/ABI/
directory describing what is happening here, that needs to be added at
the least.
thanks,
greg k-h
^ permalink raw reply
* Re: [linux-next PATCH] MAINTAINERS: Generic UIO use M: "Michael S. Tsirkin" <mst@redhat.com>
From: Greg KH @ 2009-09-15 15:32 UTC (permalink / raw)
To: Joe Perches; +Cc: Michael S. Tsirkin, linux-next, Andrew Morton
In-Reply-To: <1252999424.19910.6.camel@Joe-Laptop.home>
On Tue, Sep 15, 2009 at 12:23:44AM -0700, Joe Perches wrote:
> Hi Michael.
>
> Your new entry needs to be updated a bit.
> The P: entry is deprecated and M: is used for "name" <address>
>
> Your name also needs to be quoted so people can copy/paste
> it and that scripts/get_maintainer.pl works.
>
> cheers, Joe
>
> Signed-off-by: Joe Perches <joe@perches.com>
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 70ca14b..1246238 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2237,7 +2237,7 @@ S: Maintained
> F: include/asm-generic
>
> GENERIC UIO DRIVER FOR PCI DEVICES
> -P: Michael S. Tsirkin <mst@redhat.com>
> +M: "Michael S. Tsirkin" <mst@redhat.com>
I will edit the patch in my tree that causes this to happen.
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: drbd tree build failure
From: Philipp Reisner @ 2009-09-15 14:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Nikanth Karthikesan, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
drbd-dev-cunTk1MwBs8qoQakbn7OcQ,
linux-next-u79uwXL29TY76Z2rM5mHXA, Jens Axboe
In-Reply-To: <20090915165309.f07381ec.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
On Tuesday 15 September 2009 08:53:09 Stephen Rothwell wrote:
> Hi Jens,
>
> On Tue, 15 Sep 2009 08:23:06 +0200 Jens Axboe <jens.axboe-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> wrote:
> > Fix looks correct.
>
> Thanks for the confirmation. So hopefully one of these trees will be
> merged by Linus soon an this can be fixed up in the other.
Thanks everybody.
I have applied Stephens' patch to the DRBD tree.
-phil
^ 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