linux/staging at 86f6cf41272de9d6ffa05ab46028b15d160a6f3e - linux - Nytegear Gitea

mirrors/linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-21 23:46:05 -04:00

Files

History

David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/bonding/bond_alb.c
	drivers/net/ethernet/altera/altera_msgdma.c
	drivers/net/ethernet/altera/altera_sgdma.c
	net/ipv6/xfrm6_output.c

Several cases of overlapping changes.

The xfrm6_output.c has a bug fix which overlaps the renaming
of skb->local_df to skb->ignore_df.

In the Altera TSE driver cases, the register access cleanups
in net-next overlapped with bug fixes done in net.

Similarly a bug fix to send ALB packets in the bonding driver using
the right source address overlaps with cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-05-24 00:32:30 -04:00

..

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2014-04-02 16:23:38 -07:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2014-04-02 16:23:38 -07:00

Staging: ced1401: Fix no new typedef warning in ced_ioctl.h

2014-03-18 13:30:44 -07:00

staging: comedi: usbdux: bug fix for accessing 'ao_chanlist' in private data

2014-04-23 16:20:15 -07:00

staging: Remove OOM message after input_allocate_device

2013-10-29 09:05:21 -07:00

staging: crystalhd: Fix no space before tabs

2014-03-16 21:32:32 -07:00

Staging: cxt1e1: Fix externs should be avoided in .c files in comet.c

2014-03-19 09:17:23 -07:00

staging: dgap: fix the rest of the checkpatch warnings in dgap.c

2014-03-19 13:54:39 -07:00

staging:dgnc: Removed assignments from if statements.

2014-03-17 16:42:47 -07:00

drivers/staging/dgrp:dgrp_tty.c: Fix line over 80 characters.

2014-03-18 10:53:21 -07:00

net: get rid of SET_ETHTOOL_OPS

2014-05-13 17:43:20 -04:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2014-04-02 16:23:38 -07:00

net: get rid of SET_ETHTOOL_OPS

2014-05-13 17:43:20 -04:00

staging/fwserial: don't use PREPARE_WORK

2014-03-07 10:24:50 -05:00

staging: gdm72xx: remove completed TODO item

2014-03-16 19:53:58 -07:00

Staging: gdm724x: Fix unchecked sscanf values in gdm_lte.c

2014-03-18 11:35:53 -07:00

staging: goldfish: Call free_irq in error path

2014-04-16 11:41:44 -07:00

staging: gs_fpgaboot: remove __TIMESTAMP__ macro

2014-04-15 14:46:43 -07:00

staging:iio:ad2s1200 fix missing parenthesis in a for statment.

2014-04-26 10:51:14 +01:00

imx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus'

2014-04-26 11:23:38 +01:00

staging:keucr: Remove typedefs

2014-03-16 22:01:41 -07:00

Merge tag 'staging-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2014-04-01 16:45:00 -07:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-04-12 17:31:22 -07:00

[media] Prefer gspca_sonixb over sn9c102 for all devices

2014-04-15 09:59:31 -03:00

staging/mt29f_spinand: fix build error when ONDIEECC not enabled

2013-10-15 12:19:48 -07:00

net: get rid of SET_ETHTOOL_OPS

2014-05-13 17:43:20 -04:00

staging: nokia_h4p: Fix quoted string split across lines

2014-03-19 13:50:23 -07:00

staging:nvec: Introduce the use of the managed version of kzalloc

2014-03-07 15:19:36 -08:00

net: get rid of SET_ETHTOOL_OPS

2014-05-13 17:43:20 -04:00

staging: octeon-usb: prevent memory corruption

2014-03-20 01:51:12 +00:00

staging: olpc_dcon: Trivial: Remove space before indentation.

2014-02-07 10:35:30 -08:00

staging:ozwpan:Fix sparse warning of cast to restricted __le16

2014-03-18 11:58:45 -07:00

Staging: panel: Fix quoted string split across line in panel.c

2014-02-27 12:29:24 -08:00

staging: delete non-required instances of include <linux/init.h>

2013-12-17 10:08:14 -08:00

ACPI: Clean up inclusions of ACPI header files

2013-12-07 01:03:14 +01:00

staging: r8188eu: Fix case where ethtype was never obtained and always be checked against 0

2014-04-16 13:07:19 -07:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2014-04-02 16:23:38 -07:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2014-04-02 16:23:38 -07:00

staging: r8712u: Fix case where ethtype was never obtained and always be checked against 0

2014-04-16 13:07:19 -07:00

staging: rtl8723au: Do not reset wdev->iftype in netdev_close()

2014-05-16 15:23:11 -07:00

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2014-05-02 13:47:50 -04:00

staging: rts5139: Added in sd_cprm.c an include to fix a sparse warning

2014-03-16 17:41:13 -07:00

staging: rts5208: Fix line over 80 characters.

2014-03-18 11:56:51 -07:00

/drivers/staging/sbe2t3e3: Fixed left brace to be on the previous line

2014-03-10 15:06:22 -07:00

staging: sep: Add fallthrough comment

2014-03-16 17:52:00 -07:00

drivers/staging/serqt_usb2:serqt_usb2.c Fix line over 80 characters.

2014-03-18 11:18:05 -07:00

staging/silicom/bypasslib/bp_ioctl.h Fix do not add new typedefs.

2014-03-18 11:55:31 -07:00

staging: slicoss: free IO remapping on failure

2014-03-18 12:11:55 -07:00

staging: speakup: fix misuse of kstrtol() in handle_goto()

2014-04-16 11:41:44 -07:00

staging: Remove OOM message after input_allocate_device

2013-10-29 09:05:21 -07:00

staging/tidspbridge/rmgr/mgr.c Fix quoted string split across lines

2014-03-19 09:27:39 -07:00

Staging: unisys: use after free in list_for_each()

2014-04-16 11:41:45 -07:00

staging/usbip: fix store_attach() sscanf return value check

2014-04-15 14:43:01 -07:00

staging: vme: fix memory leak in vme_user_probe()

2014-04-15 14:46:43 -07:00

staging:vt6655: Fix sparse warnings of using plain integer as NULL pointer

2014-03-18 11:01:21 -07:00

staging: vt6656: s_uGetRTSCTSRsvTime fix return.

2014-03-19 09:00:19 -07:00

staging: winbond: Fix line over 80 characters.

2014-03-19 09:27:39 -07:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-04-02 20:53:45 -07:00

staging: wlags49_h2: remove sysfs file

2013-08-24 10:24:40 -07:00

Staging: wlan-ng: Fix smatch warning potential null reference

2014-03-19 13:41:27 -07:00

video: move fbdev to drivers/video/fbdev

2014-04-17 08:10:19 +03:00

staging: xillybus: XILLYBUS_PCIE depends on PCI_MSI

2014-03-21 12:24:09 -07:00

Kconfig

staging: delete rtl8187se wireless driver

2014-04-16 11:35:54 -07:00

Makefile

staging: delete rtl8187se wireless driver

2014-04-16 11:35:54 -07:00

staging.c

…