31 Oct, 2011
1 commit
-
* 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits)
video: platinumfb: Add __devexit_p at necessary place
drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data
drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data
drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported
drivers/video: fsl-diu-fb: remove unused panel operating mode support
drivers/video: fsl-diu-fb: use an enum for the AOI index
drivers/video: fsl-diu-fb: add several new video modes
drivers/video: fsl-diu-fb: remove broken screen blanking support
drivers/video: fsl-diu-fb: move some definitions out of the header file
drivers/video: fsl-diu-fb: fix some ioctls
video: da8xx-fb: Increased resolution configuration of revised LCDC IP
OMAPDSS: picodlp: add missing #include
fb: fix au1100fb bitrot.
mx3fb: fix NULL pointer dereference in screen blanking.
video: irq: Remove IRQF_DISABLED
smscufx: change edid data to u8 instead of char
OMAPDSS: DISPC: zorder support for DSS overlays
OMAPDSS: DISPC: VIDEO3 pipeline support
OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting
video/omap: fix build dependencies
...Fix up conflicts in:
- drivers/staging/xgifb/XGI_main_26.c
Changes to XGIfb_pan_var()
- drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c}
Removed (or in the case of apollon.c, merged into the generic
DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)
28 Oct, 2011
2 commits
-
* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (290 commits)
Revert "drm/ttm: add a way to bo_wait for either the last read or last write"
Revert "drm/radeon/kms: add a new gem_wait ioctl with read/write flags"
vmwgfx: Don't pass unused arguments to do_dirty functions
vmwgfx: Emulate depth 32 framebuffers
drm/radeon: Lower the severity of the radeon lockup messages.
drm/i915/dp: Fix eDP on PCH DP on CPT/PPT
drm/i915/dp: Introduce is_cpu_edp()
drm/i915: use correct SPD type value
drm/i915: fix ILK+ infoframe support
drm/i915: add DP test request handling
drm/i915: read full receiver capability field during DP hot plug
drm/i915/dp: Remove eDP special cases from bandwidth checks
drm/i915/dp: Fix the math in intel_dp_link_required
drm/i915/panel: Always record the backlight level again (but cleverly)
i915: Move i915_read/write out of line
drm/i915: remove transcoder PLL mashing from mode_set per specs
drm/i915: if transcoder disable fails, say which
drm/i915: set watermarks for third pipe on IVB
drm/i915: export a CPT mode set verification function
drm/i915: fix transcoder PLL select masking
... -
* 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Hyper-V: Integrate the clocksource with Hyper-V detection codeFix up conflicts in drivers/staging/hv/Makefile manually (some of the hv
code has moved out of staging to drivers/hv/)
26 Oct, 2011
3 commits
-
Mark Einon points out that the Kconfig option for NETDEV_1000 no longer
exists, and the merge of the staging drivers should have removed that
for the et131x driver.And while checking for it, I noticed that slicoss had the same stale
dependency. Remove that one too.Reported-by: Mark Einon
Signed-off-by: Linus Torvalds -
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
staging: et131x: Remove redundant check and return statement
staging: et131x: Mainly whitespace changes to appease checkpatch
staging: et131x: Remove last of the forward declarations
staging: et131x: Remove even more forward declarations
staging: et131x: Remove yet more forward declarations
staging: et131x: Remove more forward declarations
staging: et131x: Remove forward declaration of et131x_adapter_setup
staging: et131x: Remove some forward declarations
staging: et131x: Remove unused rx_ring.recv_packet_pool
staging: et131x: Remove call to find pci pm capability
staging: et131x: Remove redundant et131x_reset_recv() call
staging: et131x: Remove unused rx_ring.recv_buffer_pool
Staging: bcm: Fix three initialization errors in InterfaceDld.c
Staging: bcm: Fix coding style issues in InterfaceDld.c
staging:iio:dac: Add AD5360 driver
staging:iio:trigger:bfin-timer: Fix compile error
Staging: vt6655: add some range checks before memcpy()
Staging: vt6655: whitespace fixes to iotcl.c
Staging: vt6656: add some range checks before memcpy()
Staging: vt6656: whitespace cleanups in ioctl.c
...Fix up conflicts in:
- drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
vg driver movement
- drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
driver removal vs now stale changes
- drivers/staging/rtl8192e/r8192E_core.c:
driver removal vs now stale changes
- drivers/staging/et131x/et131*:
driver consolidation into one file, tried to do fixups -
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (79 commits)
TTY: serial_core: Fix crash if DCD drop during suspend
tty/serial: atmel_serial: bootconsole removed from auto-enumerates
Revert "TTY: call tty_driver_lookup_tty unconditionally"
tty/serial: atmel_serial: add device tree support
tty/serial: atmel_serial: auto-enumerate ports
tty/serial: atmel_serial: whitespace and braces modifications
tty/serial: atmel_serial: change platform_data variable name
tty/serial: RS485 bindings for device tree
TTY: call tty_driver_lookup_tty unconditionally
TTY: pty, release tty in all ptmx_open fail paths
TTY: make tty_add_file non-failing
TTY: drop driver reference in tty_open fail path
8250_pci: Fix kernel panic when pch_uart is disabled
h8300: drivers/serial/Kconfig was moved
parport_pc: release IO region properly if unsupported ITE887x card is found
tty: Support compat_ioctl get/set termios_locked
hvc_console: display printk messages on console.
TTY: snyclinkmp: forever loop in tx_load_dma_buffer()
tty/n_gsm: avoid fifo overflow in gsm_dlci_data_output
tty/n_gsm: fix a bug in gsm_dlci_data_output (adaption = 2 case)
...Fix up Conflicts in:
- drivers/tty/serial/8250_pci.c
Trivial conflict with removed duplicate device ID
- drivers/tty/serial/atmel_serial.c
Annoying silly conflict between "specify the port num via
platform_data" and other changes to atmel_console_init
25 Oct, 2011
4 commits
-
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1745 commits)
dp83640: free packet queues on remove
dp83640: use proper function to free transmit time stamping packets
ipv6: Do not use routes from locally generated RAs
|PATCH net-next] tg3: add tx_dropped counter
be2net: don't create multiple RX/TX rings in multi channel mode
be2net: don't create multiple TXQs in BE2
be2net: refactor VF setup/teardown code into be_vf_setup/clear()
be2net: add vlan/rx-mode/flow-control config to be_setup()
net_sched: cls_flow: use skb_header_pointer()
ipv4: avoid useless call of the function check_peer_pmtu
TCP: remove TCP_DEBUG
net: Fix driver name for mdio-gpio.c
ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
rtnetlink: Add missing manual netlink notification in dev_change_net_namespaces
ipv4: fix ipsec forward performance regression
jme: fix irq storm after suspend/resume
route: fix ICMP redirect validation
net: hold sock reference while processing tx timestamps
tcp: md5: add more const attributes
Add ethtool -g support to virtio_net
...Fix up conflicts in:
- drivers/net/Kconfig:
The split-up generated a trivial conflict with removal of a
stale reference to Documentation/networking/net-modules.txt.
Remove it from the new location instead.
- fs/sysfs/dir.c:
Fairly nasty conflicts with the sysfs rb-tree usage, conflicting
with Eric Biederman's changes for tagged directories. -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
MAINTAINERS: linux-m32r is moderated for non-subscribers
linux@lists.openrisc.net is moderated for non-subscribers
Drop default from "DM365 codec select" choice
parisc: Kconfig: cleanup Kernel page size default
Kconfig: remove redundant CONFIG_ prefix on two symbols
cris: remove arch/cris/arch-v32/lib/nand_init.S
microblaze: add missing CONFIG_ prefixes
h8300: drop puzzling Kconfig dependencies
MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
tty: drop superfluous dependency in Kconfig
ARM: mxc: fix Kconfig typo 'i.MX51'
Fix file references in Kconfig files
aic7xxx: fix Kconfig references to READMEs
Fix file references in drivers/ide/
thinkpad_acpi: Fix printk typo 'bluestooth'
bcmring: drop commented out line in Kconfig
btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
doc: raw1394: Trivial typo fix
CIFS: Don't free volume_info->UNC until we are entirely done with it.
treewide: Correct spelling of successfully in comments
... -
This was done to resolve a conflict in the
drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build
bugfix in Linus's tree with a "better" bugfix that was in the
staging-next tree that resolved the issue in a more complete manner.Signed-off-by: Greg Kroah-Hartman
23 Oct, 2011
30 commits
-
In nic_send_packet(), by the time 'frag' is checked to be zero, it never
is - the for loop has been entered (as nr_frags is always > 0) and frag
has been incremented at least once. Remove the check and associated
error return.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
- Whitespace changes to appease checkpatch warnings
- Removed unneeded braces around single line if/elseSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Moved functions in et131x.c file to remove the forward declarations of:
et131x_rx_dma_disable
et131x_rx_dma_enable
et131x_init_send
et131x_tx_dma_enableSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Moved functions in et131x.c file to remove the forward declarations of:
et1310_in_phy_coma
et1310_phy_access_mii_bit
et131x_phy_mii_read
et131x_mii_write
et131x_rx_dma_memory_freeSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Moved functions in et131x.c file to remove the forward declarations of:
et1310_setup_device_for_multicast
et1310_setup_device_for_unicast
et131x_up
et131x_down
et131x_enable_txrx
et131x_disable_txrxSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Moved functions in et131x.c file to remove the following forward
declarations:et131x_soft_reset
et131x_isr_handler
et131x_device_allocSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Also associated function movements within et131x.c file
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Moved functions in et131x.c file to remove the following forward
declarations:et131x_align_allocated_memory
et131x_disable_interrupts
et131x_enable_interrupts
et131x_error_timer_handlerSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
tx_ring.recv_packet_pool is unused, even in the original driver code.
Removed.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
pci_find_capability is called, but not used and is now redundant as
power management is handled elsewhere. Removed.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
This call doesn't do anything useful - only warns on the receive list
being empty, so removed it.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
rx_ring.recv_buffer_pool is unused, even in the original driver code.
Remove from stuct, and also remove some comments regarding it.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
This patch fixes three initialization errors.
One is an incorrect initialization of a static
variable. The other two are incorrect
initializations in an if statement. These
errors were found by checkpatch.pl.Signed-off-by: Kevin McKinney
Signed-off-by: Greg Kroah-Hartman -
This patch fixes multiple coding style issues in file,
InterfaceDld.c, found by checkpatch.pl.Signed-off-by: Kevin McKinney
Signed-off-by: Greg Kroah-Hartman -
This patch adds support for the Analog Devices AD5360, AD5361, AD5362, AD5363,
AD5370, AD5371, AD5372, AD5373 multi-channel digital-to-analog converters.Signed-off-by: Lars-Peter Clausen
Acked-by: Jonathan Cameron
Acked-by: Michael Hennerich
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Lars-Peter Clausen
Acked-by: Jonathan Cameron
Signed-off-by: Greg Kroah-Hartman -
There were no range checks in the original code so the user could
write past the end of the array.Signed-off-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman -
The indents didn't line up at all in the original code. I also fixed
a bunch of other white issues as I went along. I changed the comment
style and removed some commented out code.Signed-off-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman -
We need to verify that we're not writing past the end of the array.
Signed-off-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman -
The indents on this file didn't line up so it was hard to work with.
I changed other white space issues as I came across them. I also
deleted or changed some couple comments and the comment style.Signed-off-by: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman -
Some defines are no longer referenced in the code, so removed them.
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Replaced pci map/unmap and set_mask calls with their dma equivalents.
Also updated comments to reflect this.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
* Currently the tx queue is only stopped when the current packet fails.
Check if the next packet will fail, and stop the queue if so.* Removed associated item from TODO list in the README.
* Also minor fixup as adapter was being declared as null and immediately set
to a value.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Used the convenience macros DEFINE_PCI_DEVICE_TABLE and PCI_VDEVICE to
tidy up the device table definition.Also remove the corresponding TODO item from the README.
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Previous update was to replace pci_alloc with dma_alloc calls. I missed
replacing the corresponding pci_free_ calls with the dma versions. Now
done. Thanks to Denis Kirjanov for pointing this
out.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Use dma_allocs instead of pci_allocs, so we can use GFP_KERNEL
allocations.Also removed this item from the TODO list
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
* Following on from making rx_ring.fbr use a common structure - reversed
the fbr[] array indicies so that index 1 = FBR0 and index 0 = FBR1,
which allows USE_FBR0 define to work.* Also fixed up minor issues where indexes into the array were out of
bounds in some places.* Removed rx_ring.fbr common stuct TODO item from README
Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Sharing a common structure by moving common structure items into
fbr_lookup.TODO - Currently will not work if USE_FBR0 = 0 as FBR1 uses fbr[1]
which is removed in this caseSigned-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Two helper functions for adding 10bit/12bit umbers with wrapping are
defined in the header. Moved them to the driver .c file.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman -
Driver now resides in a single file with a separate header with
registers, updated the README TODO list.Signed-off-by: Mark Einon
Signed-off-by: Greg Kroah-Hartman
