27 May, 2011
1 commit
-
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
gfs2: Drop __TIME__ usage
isdn/diva: Drop __TIME__ usage
atm: Drop __TIME__ usage
dlm: Drop __TIME__ usage
wan/pc300: Drop __TIME__ usage
parport: Drop __TIME__ usage
hdlcdrv: Drop __TIME__ usage
baycom: Drop __TIME__ usage
pmcraid: Drop __DATE__ usage
edac: Drop __DATE__ usage
rio: Drop __DATE__ usage
scsi/wd33c93: Drop __TIME__ usage
scsi/in2000: Drop __TIME__ usage
aacraid: Drop __TIME__ usage
media/cx231xx: Drop __TIME__ usage
media/radio-maxiradio: Drop __TIME__ usage
nozomi: Drop __TIME__ usage
cyclades: Drop __TIME__ usage
26 May, 2011
3 commits
-
The kernel already prints its build timestamp during boot, no need to
repeat it in random drivers and produce different object files each
time.Cc: Armin Schindler
Cc: netdev@vger.kernel.org
Signed-off-by: Michal Marek -
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits)
bonding: documentation and code cleanup for resend_igmp
bonding: prevent deadlock on slave store with alb mode (v3)
net: hold rtnl again in dump callbacks
Add Fujitsu 1000base-SX PCI ID to tg3
bnx2x: protect sequence increment with mutex
sch_sfq: fix peek() implementation
isdn: netjet - blacklist Digium TDM400P
via-velocity: don't annotate MAC registers as packed
xen: netfront: hold RTNL when updating features.
sctp: fix memory leak of the ASCONF queue when free asoc
net: make dev_disable_lro use physical device if passed a vlan dev (v2)
net: move is_vlan_dev into public header file (v2)
bug.h: Fix build with CONFIG_PRINTK disabled.
wireless: fix fatal kernel-doc error + warning in mac80211.h
wireless: fix cfg80211.h new kernel-doc warnings
iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
dst: catch uninitialized metrics
be2net: hash key for rss-config cmd not set
bridge: initialize fake_rtable metrics
net: fix __dst_destroy_metrics_generic()
...Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
-
[2nd try ... 1st attempt didn't make it to netdev mailing list]
A quick google search reveals that people with this card are blacklisting it
in the initramfs and in the module blacklist based on a statement that it
is unsupported. Since the older Digium is also unsupported I'm pretty
confident that this newer card is also not supported.lspci -xxx -vv shows
04:07.0 Communication controller: Tiger Jet Network Inc. Tiger3XX Modem/ISDN interface
Subsystem: Device b100:0003
P.----8
Signed-off-by: David S. Miller
25 May, 2011
1 commit
-
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: Make struct pcmcia_device_id const, sound drivers edition
staging: pcmcia: Convert pcmcia_device_id declarations to const
pcmcia: Convert pcmcia_device_id declarations to const
pcmcia: Make declaration and uses of struct pcmcia_device_id const
pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data
24 May, 2011
1 commit
-
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
tty/serial: Fix break handling for PORT_TEGRA
tty/serial: Add explicit PORT_TEGRA type
n_tracerouter and n_tracesink ldisc additions.
Intel PTI implementaiton of MIPI 1149.7.
Kernel documentation for the PTI feature.
export kernel call get_task_comm().
tty: Remove to support serial for S5P6442
pch_phub: Support new device ML7223
8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
ASoC: Update cx20442 for TTY API change
pch_uart: Support new device ML7223 IOH
parport: Use request_muxed_region for IT87 probe and lock
tty/serial: add support for Xilinx PS UART
n_gsm: Use print_hex_dump_bytes
drivers/tty/moxa.c: Put correct tty value
TTY: tty_io, annotate locking functions
TTY: serial_core, remove superfluous set_task_state
TTY: serial_core, remove invalid test
Char: moxa, fix locking in moxa_write
...Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
drivers/tty/serial/Makefile.I did the hci_ldisc thing as an evil merge, cleaning things up.
20 May, 2011
1 commit
-
I was investigating some warnings that spew because of the
_DEBUG_FOO ifdef'ery in here.Instead of adding more ifdefs to fix that warning, let's use
pr_debug() and get rid of these CPP checks altogether.Signed-off-by: David S. Miller
14 May, 2011
1 commit
-
The file st5481_init.c locally defines and initializes the adapter_list
variable, but does not use it for anything. Removing the list makes it
possible to remove the list field from the st5481_adapter data structure.
In the function probe_st5481, it also makes it possible to free the locally
allocated adapter value on an error exit.Signed-off-by: Julia Lawall
Signed-off-by: David S. Miller
06 May, 2011
1 commit
-
Saves about 50KB of data.
Old/new size of all objects:
text data bss dec hex filename
563015 80096 130684 773795 bcea3 (TOTALS)
610916 32256 130632 773804 bceac (TOTALS)Signed-off-by: Joe Perches
Acked-by: Kurt Van Dijck (for drivers/net/can/softing/softing_cs.c)
Signed-off-by: Dominik Brodowski
23 Apr, 2011
1 commit
-
it makes it simpler to keep track of the amount of
bytes received and simplifies how flush_to_ldisc counts
the remaining bytes. It also fixes a bug of lost bytes
on n_tty when flushing too many bytes via the USB
serial gadget driver.Tested-by: Stefan Bigler
Tested-by: Toby Gray
Signed-off-by: Felipe Balbi
Signed-off-by: Greg Kroah-Hartman
18 Apr, 2011
17 commits
-
The variable 'fcr' is set but not used in isdn_tty_change_speed().
Just kill it off.
Signed-off-by: David S. Miller
-
The variable 'len' is set but unused in data_sock_getsockopt().
The code should use 'len' to validate that the user's socket option is
indeed the right size.Signed-off-by: David S. Miller
-
The variable 'unused' is set but unused in
isdn_net_ciscohdlck_slarp_in(). Just kill it off.Signed-off-by: David S. Miller
-
The variable 'ch' is set but unused in isdn_capi_rec_hl_msg(). Just
kill it off.Similarly for 'chidx' in isdn_ioctl() and 'di' in
isdn_capi_rec_hl_msg().Signed-off-by: David S. Miller
-
The variable 'dev' is set but unused in teles_cs_config(). Just
kill it off.Signed-off-by: David S. Miller
-
The variable 'cause' is set but unused in ni1up(). Just
kill it off.Signed-off-by: David S. Miller
-
The variable 'cause' is set but unused in dss1up(). Just
kill it off.Signed-off-by: David S. Miller
-
The variable 'i' is set but unused in JadeVersion(). Just
kill it off.Signed-off-by: David S. Miller
-
The variable 'cda2_cr' is set but unused in ctrl_complete(). Just
kill it off.Keep the cs->readisac() call just in case the register read has side
effects.Signed-off-by: David S. Miller
-
The variable 'buf' is set but unused in
ctrl_complete(). Just kill it off.Similarly for 'err' in hfc_usb_init().
Signed-off-by: David S. Miller
-
The variable 'bits' is set but unused in
change_speed(). Just kill it off.Signed-off-by: David S. Miller
-
The variable 'dev' is set but unused in
elsa_cs_config(). Just kill it off.Signed-off-by: David S. Miller
-
The variable 'val' is set but unused in
send_arcofi(). Just kill it off.Signed-off-by: David S. Miller
-
The variable 'buf' is set but unused in
ctrl_complete(). Just kill it off.Similarly for the variable 'err' in setup_hfcsusb().
Signed-off-by: David S. Miller
-
The variable 'total' is set but unused in
hfcpci_empty_bfifo(). Just kill it off.Similarly for the variable 'val' in ph_state_nt().
Signed-off-by: David S. Miller
-
The variable 'best_id' is set but unused in
diva_mnt_add_xdi_adapter(). Just kill it off.Similarly for the variable 'CIP' in connect_req(), 'Number' in
sig_ind(), 'Info' in dtmf_confirmation() mixer_command()
fax_connect_ack_command() fax_edata_ack_command()
rtp_connect_b3_res_command() and rtp_connect_b3_res_command(), and 'a'
in mixer_indication_coefs_set(),Signed-off-by: David S. Miller
-
The variable 'offset' is set but unused in
write_iso_tasklet(). Just kill it off.Signed-off-by: David S. Miller
12 Apr, 2011
1 commit
-
Conflicts:
drivers/net/smsc911x.c
07 Apr, 2011
1 commit
-
udev fully replaces this special file system that only contains CAPI
NCCI TTY device nodes. User space (pppdcapiplugin) works without
noticing the difference.Signed-off-by: Jan Kiszka
Signed-off-by: David S. Miller
04 Apr, 2011
1 commit
-
Signed-off-by: Jan Engelhardt
Signed-off-by: David S. Miller
31 Mar, 2011
2 commits
-
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi
-
Signed-off-by: Alexey Dobriyan
Signed-off-by: David S. Miller
21 Mar, 2011
1 commit
-
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
video: change to new flag variable
scsi: change to new flag variable
rtc: change to new flag variable
rapidio: change to new flag variable
pps: change to new flag variable
net: change to new flag variable
misc: change to new flag variable
message: change to new flag variable
memstick: change to new flag variable
isdn: change to new flag variable
ieee802154: change to new flag variable
ide: change to new flag variable
hwmon: change to new flag variable
dma: change to new flag variable
char: change to new flag variable
fs: change to new flag variable
xtensa: change to new flag variable
um: change to new flag variables
s390: change to new flag variable
mips: change to new flag variable
...Fix up trivial conflict in drivers/hwmon/Makefile
19 Mar, 2011
1 commit
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
Update cpuset info & webiste for cgroups
dcdbas: force SMI to happen when expected
arch/arm/Kconfig: remove one to many l's in the word.
asm-generic/user.h: Fix spelling in comment
drm: fix printk typo 'sracth'
Remove one to many n's in a word
Documentation/filesystems/romfs.txt: fixing link to genromfs
drivers:scsi Change printk typo initate -> initiate
serial, pch uart: Remove duplicate inclusion of linux/pci.h header
fs/eventpoll.c: fix spelling
mm: Fix out-of-date comments which refers non-existent functions
drm: Fix printk typo 'failled'
coh901318.c: Change initate to initiate.
mbox-db5500.c Change initate to initiate.
edac: correct i82975x error-info reported
edac: correct i82975x mci initialisation
edac: correct commented info
fs: update comments to point correct document
target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
...Trivial conflict in fs/eventpoll.c (spelling vs addition)
17 Mar, 2011
2 commits
-
Replace EXTRA_CFLAGS with ccflags-y.
Signed-off-by: matt mooney
Acked-by: WANG Cong
Acked-by: David S. Miller
Signed-off-by: Michal Marek -
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
pch_uart: reference clock on CM-iTC
pch_phub: add new device ML7213
n_gsm: fix UIH control byte : P bit should be 0
n_gsm: add a documentation
serial: msm_serial_hs: Add MSM high speed UART driver
tty_audit: fix tty_audit_add_data live lock on audit disabled
tty: move cd1865.h to drivers/staging/tty/
Staging: tty: fix build with epca.c driver
pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
Staging: generic_serial: fix double locking bug
nozomi: don't use flush_scheduled_work()
tty/serial: Relax the device_type restriction from of_serial
MAINTAINERS: Update HVC file patterns
tty: phase out of ioctl file pointer for tty3270 as well
tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
pch_uart: Fix DMA channel miss-setting issue.
pch_uart: fix exclusive access issue
pch_uart: fix auto flow control miss-setting issue
pch_uart: fix uart clock setting issue
pch_uart : Use dev_xxx not pr_xxx
...Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)
01 Mar, 2011
1 commit
-
The below patch changes a typo "pice" to "piece"
Signed-off-by: Justin P. Mattock
Signed-off-by: David S. Miller
25 Feb, 2011
1 commit
-
This was to resolve a merge issue with drivers/char/Makefile and
drivers/tty/serial/68328serial.cSigned-off-by: Greg Kroah-Hartman
18 Feb, 2011
2 commits
-
Only oddities here are a couple of drivers that bogusly called the ldisc
helpers instead of returning -ENOIOCTLCMD. Fix the bug and the rest goes
away.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Doing tiocmget was such fun we should do tiocmset as well for the same
reasonsSigned-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman
