17 Dec, 2009

3 commits

  • * 'for-33' of git://repo.or.cz/linux-kbuild: (29 commits)
    net: fix for utsrelease.h moving to generated
    gen_init_cpio: fixed fwrite warning
    kbuild: fix make clean after mismerge
    kbuild: generate modules.builtin
    genksyms: properly consider EXPORT_UNUSED_SYMBOL{,_GPL}()
    score: add asm/asm-offsets.h wrapper
    unifdef: update to upstream revision 1.190
    kbuild: specify absolute paths for cscope
    kbuild: create include/generated in silentoldconfig
    scripts/package: deb-pkg: use fakeroot if available
    scripts/package: add KBUILD_PKG_ROOTCMD variable
    scripts/package: tar-pkg: use tar --owner=root
    Kbuild: clean up marker
    net: add net_tstamp.h to headers_install
    kbuild: move utsrelease.h to include/generated
    kbuild: move autoconf.h to include/generated
    drop explicit include of autoconf.h
    kbuild: move compile.h to include/generated
    kbuild: drop include/asm
    kbuild: do not check for include/asm-$ARCH
    ...

    Fixed non-conflicting clean merge of modpost.c as per comments from
    Stephen Rothwell (modpost.c had grown an include of linux/autoconf.h
    that needed to be changed to generated/autoconf.h)

    Linus Torvalds
     
  • * 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6: (34 commits)
    HWPOISON: Remove stray phrase in a comment
    HWPOISON: Try to allocate migration page on the same node
    HWPOISON: Don't do early filtering if filter is disabled
    HWPOISON: Add a madvise() injector for soft page offlining
    HWPOISON: Add soft page offline support
    HWPOISON: Undefine short-hand macros after use to avoid namespace conflict
    HWPOISON: Use new shake_page in memory_failure
    HWPOISON: Use correct name for MADV_HWPOISON in documentation
    HWPOISON: mention HWPoison in Kconfig entry
    HWPOISON: Use get_user_page_fast in hwpoison madvise
    HWPOISON: add an interface to switch off/on all the page filters
    HWPOISON: add memory cgroup filter
    memcg: add accessor to mem_cgroup.css
    memcg: rename and export try_get_mem_cgroup_from_page()
    HWPOISON: add page flags filter
    mm: export stable page flags
    HWPOISON: limit hwpoison injector to known page types
    HWPOISON: add fs/device filters
    HWPOISON: return 0 to indicate success reliably
    HWPOISON: make semantics of IGNORED/DELAYED clear
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
    net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2
    ixgbe: allow tx of pre-formatted vlan tagged packets
    ixgbe: Fix 82598 premature copper PHY link indicatation
    ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters
    bcm63xx_enet: fix compilation failure after get_stats_count removal
    packet: dont call sleeping functions while holding rcu_read_lock()
    tcp: Revert per-route SACK/DSACK/TIMESTAMP changes.
    ipvs: zero usvc and udest
    netfilter: fix crashes in bridge netfilter caused by fragment jumps
    ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery
    sky2: leave PCI config space writeable
    sky2: print Optima chip name
    x25: Update maintainer.
    ipvs: fix synchronization on connection close
    netfilter: xtables: document minimal required version
    drivers/net/bonding/: : use pr_fmt
    can: CAN_MCP251X should depend on HAS_DMA
    drivers/net/usb: Correct code taking the size of a pointer
    drivers/net/cpmac.c: Correct code taking the size of a pointer
    drivers/net/sfc: Correct code taking the size of a pointer
    ...

    Linus Torvalds
     

16 Dec, 2009

6 commits


15 Dec, 2009

2 commits

  • On Monday 14 December 2009, andrew hendry wrote:
    > Thanks, I didn't know X.25 was actively maintained. I get bounces.
    > Is the the maintainers out of date?

    From looking at the posts on the x.25 mailing list and the changes
    that went into the kernel during the last three years in that area,
    I think it is safe to say that you are now the maintainer ;-).

    The last mail on this topic from Henner Eisen was around 2001.

    > AX.25 NETWORK LAYER
    > M: Ralf Baechle
    >
    > X.25 NETWORK LAYER
    > M: Henner Eisen

    How about this change?

    Signed-off-by: Andrew Hendry
    Signed-off-by: David S. Miller

    Arnd Bergmann
     
  • * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (23 commits)
    spi: fix probe/remove section markings
    Add OMAP spi100k driver
    spi-imx: don't access struct device directly but use dev_get_platdata
    spi-imx: Add mx25 support
    spi-imx: use positive logic to distinguish cpu variants
    spi-imx: correct check for platform_get_irq failing
    ARM: NUC900: Add spi driver support for nuc900
    spi: SuperH MSIOF SPI Master driver V2
    spi: fix spidev compilation failure when VERBOSE is defined
    spi/au1550_spi: fix setupxfer not to override cfg with zeros
    spi/mpc8xxx: don't use __exit_p to wrap plat_mpc8xxx_spi_remove
    spi/i.MX: fix broken error handling for gpio_request
    spi/i.mx: drain MXC SPI transfer buffer when probing device
    MAINTAINERS: add SPI co-maintainer.
    spi/xilinx_spi: fix incorrect casting
    spi/mpc52xx-spi: minor cleanups
    xilinx_spi: add a platform driver using the xilinx_spi common module.
    xilinx_spi: add support for the DS570 IP.
    xilinx_spi: Switch to iomem functions and support little endian.
    xilinx_spi: Split into of driver and generic part.
    ...

    Linus Torvalds
     

13 Dec, 2009

1 commit

  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (151 commits)
    powerpc: Fix usage of 64-bit instruction in 32-bit altivec code
    MAINTAINERS: Add PowerPC patterns
    powerpc/pseries: Track previous CPPR values to correctly EOI interrupts
    powerpc/pseries: Correct pseries/dlpar.c build break without CONFIG_SMP
    powerpc: Make "intspec" pointers in irq_host->xlate() const
    powerpc/8xx: DTLB Miss cleanup
    powerpc/8xx: Remove DIRTY pte handling in DTLB Error.
    powerpc/8xx: Start using dcbX instructions in various copy routines
    powerpc/8xx: Restore _PAGE_WRITETHRU
    powerpc/8xx: Add missing Guarded setting in DTLB Error.
    powerpc/8xx: Fixup DAR from buggy dcbX instructions.
    powerpc/8xx: Tag DAR with 0x00f0 to catch buggy instructions.
    powerpc/8xx: Update TLB asm so it behaves as linux mm expects.
    powerpc/8xx: Invalidate non present TLBs
    powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate
    pseries/pseries: Add code to online/offline CPUs of a DLPAR node
    powerpc: stop_this_cpu: remove the cpu from the online map.
    powerpc/pseries: Add kernel based CPU DLPAR handling
    sysfs/cpu: Add probe/release files
    powerpc/pseries: Kernel DLPAR Infrastructure
    ...

    Linus Torvalds
     

12 Dec, 2009

7 commits

  • Fix handling of input files (e.g. with no newline at EOF) that could
    make unifdef get into an unexpected state and call abort().

    The new -B option compresses blank lines around a deleted section
    so that blank lines around "paragraphs" of code don't get doubled.

    The evaluator can now handle macros with arguments, and unbracketed
    arguments to the "defined" operator.

    Add myself to MAINTAINERS for unifdef.

    Signed-off-by: Tony Finch
    Acked-by: Sam Ravnborg
    Signed-off-by: Michal Marek

    Tony Finch
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (75 commits)
    net: Handle NETREG_UNINITIALIZED devices correctly
    can: add the driver for Analog Devices Blackfin on-chip CAN controllers
    xfrm: Fix truncation length of authentication algorithms installed via PF_KEY
    net: use compat helper functions in compat_sys_recvmmsg
    net: fix compat_sys_recvmmsg parameter type
    cxgb3: Fixing EEH handlers
    cnic: Zero out status block and Event Queue indices.
    cnic: Send delete command when shutting down iSCSI ring.
    net: smc91x: Fix up type mismatch in smc_drv_resume().
    smc91x: fix unused flags warnings on UP systems
    MAINTAINERS: Transfering maintainership of cdc-ether
    net: Add missing TST_CFG_WRITE bits around sky2_pci_write
    net: Fix Yukon-2 Optima TCP offload setup
    net: niu uses crc32, so select CRC32
    wireless: update old static regulatory domain rules
    mac80211: Revert 'Use correct sign for mesh active path refresh'
    mac80211: Fixed bug in mesh portal paths
    net/mac80211: Correct size given to memset
    b43: Remove reset after fatal DMA error
    rtl8187: add radio led and fix warnings on suspend
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
    HTC Dream: mmc compilation fixes
    video: Allow selecting MSM framebuffer in Kconfig
    Add arm msm maintainer entry
    msm: Add memory map for HTC Dream
    msm: add minimal board file for HTC Dream device
    msm: make debugging UART (for DEBUG_LL) configurable

    Linus Torvalds
     
  • Conflicts:
    include/net/tcp.h

    David S. Miller
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (122 commits)
    USB: mos7840: add device IDs for B&B electronics devices
    USB: ftdi_sio: add USB device ID's for B&B Electronics line
    USB: musb: musb_host: fix sparse warning
    USB: musb: musb_gadget: fix sparse warning
    USB: musb: omap2430: fix sparse warning
    USB: core: message: fix sparse warning
    USB: core: hub: fix sparse warning
    USB: core: fix sparse warning for static function
    USB: Added USB_ETH_RNDIS to use instead of CONFIG_USB_ETH_RNDIS
    USB: Check bandwidth when switching alt settings.
    USB: Refactor code to find alternate interface settings.
    USB: xhci: Fix command completion after a drop endpoint.
    USB: xhci: Make reverting an alt setting "unfailable".
    USB: usbtmc: Use usb_clear_halt() instead of custom code.
    USB: xhci: Add correct email and files to MAINTAINERS entry.
    USB: ehci-omap.c: introduce missing kfree
    USB: xhci-mem.c: introduce missing kfree
    USB: add remove_id sysfs attr for usb drivers
    USB: g_multi kconfig: fix depends and help text
    USB: option: add pid for ZTE
    ...

    Linus Torvalds
     
  • Oliver Neukum takes over from Greg KH

    Signed-off-by: Oliver Neukum
    Signed-off-by: Greg Kroah-Hartman
    Signed-off-by: David S. Miller

    Oliver Neukum
     
  • Add the xHCI driver files to its MAINTAINERS entry so that I'm Cc'd on
    cleanup patches. Update the email address to one I actually use for
    sending patches and responding to Linux mailing list emails.

    Signed-off-by: Sarah Sharp
    Cc: stable
    Signed-off-by: Greg Kroah-Hartman

    Sarah Sharp
     

11 Dec, 2009

3 commits

  • * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
    MAINTAINERS: Add OMAP2/3 DSS and OMAPFB maintainer
    OMAP: SDP: Enable DSS2 for OMAP3 SDP board
    OMAP: DSS2: Taal DSI command mode panel driver
    OMAP: DSS2: Add generic and Sharp panel drivers
    OMAP: DSS2: omapfb driver
    OMAP: DSS2: DSI driver
    OMAP: DSS2: SDI driver
    OMAP: DSS2: RFBI driver
    OMAP: DSS2: Video encoder driver
    OMAP: DSS2: DPI driver
    OMAP: DSS2: DISPC
    OMAP: DSS2: Add more core files
    OMAP: DSS2: Display Subsystem Driver core
    OMAP: DSS2: Documentation for DSS2
    OMAP: Add support for VRFB rotation engine
    OMAP: Add VRAM manager
    OMAP: OMAPFB: add omapdss device
    OMAP: OMAPFB: split omapfb.h
    OMAP2: Add funcs for writing SMS_ROT_* registers

    Linus Torvalds
     
  • This adds a maintainer entry for the arch/arm/mach-msm sub-architecture and
    all it's components in various locations.

    Signed-off-by: David Brown
    Signed-off-by: Bryan Huntsman
    Signed-off-by: Daniel Walker

    Daniel Walker
     
  • * git://git.infradead.org/ubifs-2.6:
    UBIFS: fix return code in check_leaf
    UBI: flush wl before clearing update marker
    MAINTAINERS: change e-mail of Artem Bityutskiy
    UBIFS: remove manual O_SYNC handling
    UBIFS: support mounting of UBI volume character devices
    UBI: Add ubi_open_volume_path

    Linus Torvalds
     

10 Dec, 2009

8 commits

  • * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (41 commits)
    hwmon: (adt7475) Add VID support for the ADT7476
    hwmon: (adt7475) Add an entry in MAINTAINERS
    hwmon: (adt7475) Add support for the ADT7476
    hwmon: (adt7475) Voltage attenuators can be bypassed
    hwmon: (adt7475) Print device information on probe
    hwmon: (adt7475) Handle alternative pin functions
    hwmon: (adt7475) Move sysfs files removal to a separate function
    hwmon: (adt7475) Add support for the ADT7490
    hwmon: (adt7475) Improve device detection
    hwmon: (adt7475) Add missing static marker
    hwmon: (adt7475) Rework voltage inputs handling
    hwmon: (adt7475) Implement pwm_use_point2_pwm_at_crit
    hwmon: (adt7475) New documentation
    hwmon: (adt7475) Add support for the ADT7473
    hwmon: (f71882fg) Add support for the f71889fg (version 2)
    hwmon: (f71882fg) Fix sysfs file removal
    hwmon: (f71882fg) Cleanup sysfs attr creation 2/2
    hwmon: (f71882fg) Cleanup sysfs attr creation 1/2
    hwmon: (thmc50) Stop using I2C_CLIENT_MODULE_PARM
    hwmon: Add Freescale MC13783 ADC driver
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (51 commits)
    Input: appletouch - give up maintainership
    Input: dm355evm_kbd - switch to using sparse keymap library
    Input: wistron_btns - switch to using sparse keymap library
    Input: add generic support for sparse keymaps
    Input: fix memory leak in force feedback core
    Input: wistron - remove identification strings from DMI table
    Input: psmouse - remove identification strings from DMI tables
    Input: atkbd - remove identification strings from DMI table
    Input: i8042 - remove identification strings from DMI tables
    DMI: allow omitting ident strings in DMI tables
    Input: psmouse - do not carry DMI data around
    Input: matrix-keypad - switch to using dev_pm_ops
    Input: keyboard - fix lack of locking when traversing handler->h_list
    Input: gpio_keys - scan gpio state at probe and resume time
    Input: keyboard - add locking around event handling
    Input: usbtouchscreen - add support for ET&T TC5UH touchscreen controller
    Input: xpad - add two new Xbox 360 devices
    Input: polled device - do not start polling if interval is zero
    Input: polled device - schedule first poll immediately
    Input: add S3C24XX touchscreen driver
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (222 commits)
    [SCSI] zfcp: Remove flag ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP
    [SCSI] zfcp: Activate fc4s attributes for zfcp in FC transport class
    [SCSI] zfcp: Block scsi_eh thread for rport state BLOCKED
    [SCSI] zfcp: Update FSF error reporting
    [SCSI] zfcp: Improve ELS ADISC handling
    [SCSI] zfcp: Simplify handling of ct and els requests
    [SCSI] zfcp: Remove ZFCP_DID_MASK
    [SCSI] zfcp: Move WKA port to zfcp FC code
    [SCSI] zfcp: Use common code definitions for FC CT structs
    [SCSI] zfcp: Use common code definitions for FC ELS structs
    [SCSI] zfcp: Update FCP protocol related code
    [SCSI] zfcp: Dont fail SCSI commands when transitioning to blocked fc_rport
    [SCSI] zfcp: Assign scheduled work to driver queue
    [SCSI] zfcp: Remove STATUS_COMMON_REMOVE flag as it is not required anymore
    [SCSI] zfcp: Implement module unloading
    [SCSI] zfcp: Merge trace code for fsf requests in one function
    [SCSI] zfcp: Access ports and units with container_of in sysfs code
    [SCSI] zfcp: Remove suspend callback
    [SCSI] zfcp: Remove global config_mutex
    [SCSI] zfcp: Replace local reference counting with common kref
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (72 commits)
    [S390] 3215/3270 console: remove wrong comment
    [S390] dasd: remove BKL from extended error reporting code
    [S390] vmlogrdr: remove BKL
    [S390] vmur: remove BKL
    [S390] zcrypt: remove BKL
    [S390] 3270: remove BKL
    [S390] vmwatchdog: remove lock_kernel() from open() function
    [S390] monwriter: remove lock_kernel() from open() function
    [S390] monreader: remove lock_kernel() from open() function
    [S390] s390: remove unused nfsd #includes
    [S390] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
    [S390] etr/stp: put correct per cpu variable
    [S390] tty3270: move keyboard compat ioctls
    [S390] sclp: improve servicability setting
    [S390] s390: use change recording override for kernel mapping
    [S390] MAINTAINERS: Add s390 drivers block
    [S390] use generic sockios.h header file
    [S390] use generic termbits.h header file
    [S390] smp: remove unused typedef and defines
    [S390] cmm: free pages on hibernate.
    ...

    Linus Torvalds
     
  • As I've just done a lot of changes to the adt7475 driver, I volunteer
    to maintain it for the year to come.

    Signed-off-by: Jean Delvare
    Cc: Hans de Goede
    Cc: Jordan Crouse
    Cc: "Darrick J. Wong"

    Jean Delvare
     
  • The National Semiconductor LM73 is a single temperature sensor, much
    like the famous LM75.

    Signed-off-by: Adrien Demarez
    Signed-off-by: Jean Delvare

    Adrien Demarez
     
  • Add missing documentation and header files to the hardware monitoring
    subsystem section.

    Signed-off-by: Jean Delvare

    Jean Delvare
     
  • Signed-off-by: Tomi Valkeinen

    Tomi Valkeinen
     

09 Dec, 2009

5 commits

  • Conflicts:
    include/linux/kvm.h

    Benjamin Herrenschmidt
     
  • On Fri, 2009-12-04 at 20:59 +1100, Benjamin Herrenschmidt wrote:
    > On Fri, 2009-12-04 at 10:34 +0100, Jean Delvare wrote:
    > > I've sent it to linuxppc-dev@ozlabs.org on October 14th. This is the
    > > address which is listed 22 times in MAINTAINERS. If it isn't correct,
    > > then please update MAINTAINERS.
    > No it's fine both shoul work. Your patches are there, just waiting for
    > me to pick them up, I was just firing a reminder to the rest of the CC
    > list :-) (and I do remember fwd'ing a couple of your patches to the
    > list, for some reason they didn't make it to patchwork back then, that
    > was a few month ago).
    > Anyways, I've been stretched thin with all sort of stuff lately, so bear
    > with me if I'm a bit slow at taking or testing stuff, I'm doing my best.

    Adding patterns to the PowerPC sections of MAINTAINERS is useful.

    Signed-off-by: Joe Perches
    Acked-by: Josh Boyer
    Acked-by: Grant Likely
    Acked-by: Olof Johansson
    Acked-by: Benjamin Herrenschmidt
    Signed-off-by: Benjamin Herrenschmidt

    Joe Perches
     
  • Signed-off-by: Grant Likely
    Acked-by: Andrew Morton

    Grant Likely
     
  • * 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block: (113 commits)
    cfq-iosched: Do not access cfqq after freeing it
    block: include linux/err.h to use ERR_PTR
    cfq-iosched: use call_rcu() instead of doing grace period stall on queue exit
    blkio: Allow CFQ group IO scheduling even when CFQ is a module
    blkio: Implement dynamic io controlling policy registration
    blkio: Export some symbols from blkio as its user CFQ can be a module
    block: Fix io_context leak after failure of clone with CLONE_IO
    block: Fix io_context leak after clone with CLONE_IO
    cfq-iosched: make nonrot check logic consistent
    io controller: quick fix for blk-cgroup and modular CFQ
    cfq-iosched: move IO controller declerations to a header file
    cfq-iosched: fix compile problem with !CONFIG_CGROUP
    blkio: Documentation
    blkio: Wait on sync-noidle queue even if rq_noidle = 1
    blkio: Implement group_isolation tunable
    blkio: Determine async workload length based on total number of queues
    blkio: Wait for cfq queue to get backlogged if group is empty
    blkio: Propagate cgroup weight updation to cfq groups
    blkio: Drop the reference to queue once the task changes cgroup
    blkio: Provide some isolation between groups
    ...

    Linus Torvalds
     
  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (272 commits)
    Fix soc_common PCMCIA configuration
    ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request
    ARM: 5826/1: SA1100: h3100/h3600: always build htc-egpio driver
    ARM: 5825/1: SA1100: h3600: update defconfig
    ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100
    ARM: 5823/1: SA1100: h3100/h3600: add support for gpio-keys
    ARM: 5822/1: SA1100: h3100/h3600: clean up #includes
    ARM: 5821/1: SA1100: h3100/h3600: revise copyright boilerplates
    ARM: 5820/1: SA1100: h3100/h3600: split h3600.c
    ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h
    ARM: 5818/1: SA1100: h3100/h3600: drop old GPIO definitions
    ARM: 5817/1: SA1100: h3100/h3600: configure all unused gpios as inputs
    ARM: 5816/1: SA1100: h3600: remove IRQ_GPIO_* definitions
    ARM: 5815/1: SA1100: h3100/h3600: remove now unused assign_h3600_egpio handlers
    ARM: 5814/1: SA1100: h3100/h3600: convert all users of assign_h3600_egpio to gpiolib
    ARM: 5813/1: SA1100: h3100/h3600: add htc-egpio driver
    ARM: 5812/1: SA1100: h3100/h3600: separate machine-specific LCD helpers
    ARM: 5811/2: pcmcia: convert sa1100_h3600 driver to gpiolib
    ARM: 5799/1: SA1100: h3600: stop setting direction for LCD pins
    ARM: 5798/1: SA1100: h3600: remove unused cruft from h3600.h
    ...

    Linus Torvalds
     

08 Dec, 2009

1 commit

  • I no longer have a machine with this, and as such am not really able
    to help out with this driver any more. Remove the entire appletouch
    section and let the driver fall under the general input subsystem.

    Signed-off-by: Johannes Berg
    Signed-off-by: Dmitry Torokhov

    Johannes Berg
     

07 Dec, 2009

2 commits


06 Dec, 2009

1 commit


05 Dec, 2009

1 commit