Commit b1b934d3 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

Merge branch 'master'

parents 5dd9feaf b6ff5083

Documentation/feature-removal-schedule.txt

+16 −0
Original line number Diff line number Diff line
@@ -258,3 +258,19 @@ Why: These drivers never compiled since they were added to the kernel 
Who:	Jean Delvare <khali@linux-fr.org>



---------------------------



What:	Bridge netfilter deferred IPv4/IPv6 output hook calling

When:	January 2007

Why:	The deferred output hooks are a layering violation causing unusual

	and broken behaviour on bridge devices. Examples of things they

	break include QoS classifation using the MARK or CLASSIFY targets,

	the IPsec policy match and connection tracking with VLANs on a

	bridge. Their only use is to enable bridge output port filtering

	within iptables with the physdev match, which can also be done by

	combining iptables and ebtables using netfilter marks. Until it

	will get removed the hook deferral is disabled by default and is

	only enabled when needed.



Who:	Patrick McHardy <kaber@trash.net>



---------------------------

Documentation/x86_64/boot-options.txt

+7 −0
Original line number Diff line number Diff line
@@ -238,6 +238,13 @@ Debugging 
  pagefaulttrace Dump all page faults. Only useful for extreme debugging

		and will create a lot of output.



  call_trace=[old|both|newfallback|new]

		old: use old inexact backtracer

		new: use new exact dwarf2 unwinder

 		both: print entries from both

		newfallback: use new unwinder but fall back to old if it gets

			stuck (default)



Misc



  noreplacement  Don't replace instructions with more appropriate ones

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -1694,10 +1694,8 @@ L: linux-kernel@vger.kernel.org 
S:	Maintained



LAPB module

P:	Henner Eisen

M:	eis@baty.hanse.de

L:	linux-x25@vger.kernel.org

S:	Maintained

S:	Orphan



LASI 53c700 driver for PARISC

P:	James E.J. Bottomley

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 18

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME=Crazed Snow-Weasel



# *DOCUMENTATION*

arch/arm/configs/ep93xx_defconfig

+10 −5
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.18-rc1

# Sun Jul  9 15:21:30 2006

# Linux kernel version: 2.6.18-rc1-git9

# Sat Jul 15 15:08:10 2006

#

CONFIG_ARM=y

CONFIG_MMU=y
@@ -30,6 +30,7 @@ CONFIG_SWAP=y 
CONFIG_SYSVIPC=y

# CONFIG_POSIX_MQUEUE is not set

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

CONFIG_IKCONFIG=y
@@ -749,7 +750,7 @@ CONFIG_VIDEO_V4L2=y 
# USB support

#

CONFIG_USB_ARCH_HAS_HCD=y

# CONFIG_USB_ARCH_HAS_OHCI is not set

CONFIG_USB_ARCH_HAS_OHCI=y

# CONFIG_USB_ARCH_HAS_EHCI is not set

CONFIG_USB=y

CONFIG_USB_DEBUG=y
@@ -766,6 +767,9 @@ CONFIG_USB_DYNAMIC_MINORS=y 
# USB Host Controller Drivers

#

# CONFIG_USB_ISP116X_HCD is not set

CONFIG_USB_OHCI_HCD=y

# CONFIG_USB_OHCI_BIG_ENDIAN is not set

CONFIG_USB_OHCI_LITTLE_ENDIAN=y

# CONFIG_USB_SL811_HCD is not set



#
@@ -855,6 +859,7 @@ CONFIG_USB_SERIAL_CONSOLE=y 
CONFIG_USB_SERIAL_PL2303=y

# CONFIG_USB_SERIAL_HP4X is not set

# CONFIG_USB_SERIAL_SAFE is not set

# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set

# CONFIG_USB_SERIAL_TI is not set

# CONFIG_USB_SERIAL_CYBERJACK is not set

# CONFIG_USB_SERIAL_XIRCOM is not set
@@ -871,7 +876,7 @@ CONFIG_USB_SERIAL_PL2303=y 
# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CY7C63 is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set
@@ -916,6 +921,7 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_X1205 is not set

# CONFIG_RTC_DRV_DS1307 is not set

# CONFIG_RTC_DRV_DS1553 is not set

# CONFIG_RTC_DRV_ISL1208 is not set

# CONFIG_RTC_DRV_DS1672 is not set

# CONFIG_RTC_DRV_DS1742 is not set

# CONFIG_RTC_DRV_PCF8563 is not set
@@ -1023,7 +1029,6 @@ CONFIG_SUNRPC=y 
# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

# CONFIG_CIFS_DEBUG2 is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set