From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>

Fix the zoran driver (zr36067) for the fact that we did not handle
bitrate-conversion at all in the zr36050 MJPEG codec (on DC30 cards), with
the result being that at high-resolution, we'd overload the PCI bus and
drop half of our video capture data into /dev/null'ishness.

Also update Ronald's email address in MAINTAINERS.

It appears that gdb, perfmon and perhaps other applications are already
opening /proc/<tid> even though it does not appear in /proc readdir output
and is available under its group leader's directory anyway.

Apparently ascertaining the group leader is hard for gdb and thsi trick
always worked for LinuxThreads apps.

So revert this change.

From: Christophe Saout <christophe@saout.de>

We should copy the bvec array for read requests so that we still
have the unmodified bvec array to decrypt the data afterwards.

(as discussed earlier this day for highmem bounces)

From: Christophe Saout <christophe@saout.de>

These are some dm-crypt cleanups.  Use a #define PFX "crypt: " for all the
places where something gets logged as suggested by Jeff Garzik.  It also
adds a small additional security check and fixed header includes.

From: Christophe Saout <christophe@saout.de>

This patch fixes the bug where in-place encryption was not detected when
the same highmem pages is mapped twice to different virtual addresses.

This adds a parameter to xxx_process to indicate whether this is an
in-place encryption and moves the responsability to the caller using a
helper function scatterwalk.h.

From: Christophe Saout <christophe@saout.de>

I've cleaned up the latest patches and adjusted the header files.

This patch moves the scatterwalk functions from cipher.c to
scatterwalk.c and adds a header file.

From: Christophe Saout <christophe@saout.de>

__end_that_request_first might modify the bv_offset and bv_len if the
segment was partially completed.  The bio-read-bounce-back code should use
the unmodified bv_offset when copying the segment data:

sysrq-o is supposed to power off the machine.  But if it calls into ACPI (at
least) it does lots of sleepy things, so we best not do this from interrupt
context.

From: "Randy.Dunlap" <rddunlap@osdl.org>

From: Alexey Dobriyan <adobriyan@mail.ru>

Mostly added descriptions of files in Documentation/ that were not listed
in Documentation/00-INDEX.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

xpram fix: Replace old style module parameter definition with new style.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

s390 tape device driver changes:

- Add private tape class to support udev configuration.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

sclp console fixes:

- Add signal-quiesce bug-fix from 2.4.

- Add irq_enter/irq_exit to sclp_sync_wait to prevent the softirqs from
  processing after the external interrupt.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

Common i/o layer fixes:

- Remove documentation entry for non-existent cio_notoper_msg parameter.

- Add documentation for availability attritube.

- Replace function of the steal_lock attribute by "echo force" to the
  online attribute.

- Trigger device sensing in the online function for unknown devices.

- Always try to get devices online even if they are marked reserved.
  Someone could have released the device while it was offline.

- Add try_module_get/module_put pairs to the online function of ccw devices
  and ccwgroup devices.

- Add owner field to ccwgroup driver structure.  Set owner field in ctc,
  lcs and qeth.

- Fix alignment problems in channel measurement block interface.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

s390 bug fixes:

- Add missing i/o controls to compat ioctl translation table.

- Fix some gcc 3.4 warnings.

- Export _sb_findmap.

- Export smp_call_function_on only if CONFIG_SMP=y.

- Add safe-guard to diag10.

- Add type definition for compat_timer_t.

- Fix first argument of signal_processor_ps.

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

This patch updates the g5_defconfig on ppc64, running it through oldconfig
and removing CONFIG_DISTCONTIGMEM.  I don't use the discontigmem stuff at
all, even on machines with +2Gb of RAM, so it's just bloat.

From: Anton Blanchard <anton@samba.org>

Add some missing EXPORT_SYMBOLs.

From: Stephen Rothwell <sfr@canb.auug.org.au>

This patch (hopefully) addresses concerns Christoph Hellwig had with the
virtual disk probing code.

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

iSeries HyperVisor is doing some evilery when inserting PTEs that I didn't
properly account for when rewriting that code, causing iSeries box to blow
up regulary.

address_spaces have a `dirtied_when' jiffies field which records the time at
which the mapping was first dirtied.  This is used for the periodic writeback
(kupdate) function.  It is also used to prevent livelocks in the writeback
code: don't try to write back objects which were dirtied after
sync_sb_inodes() was called.

It used to be the case that dirtied_when == 0 had magical properties, so
there is code in there which avoids accidentally setting dirtied_when to zero
at jiffy wrap time.  We just set it to jiffies|1.

Unfortunately, jiffies|1 is in the future.  So under some rare timing
circumstances (inode dirtied within one jiffy of umount) the livelock
avoidance code in sync_sb_inodes() can accidentally trigger and we fail to
write an inode out, resulting in filesytem corruption on ext2-style
filesystems.  Normally, nobody dirties a file within a millisecond of umount,
so it was not noticed.

It is no longer the case that (address_space.dirtied_when == 0) has special
meaning, so we can just remove all that code and fix the bug.

This fixes the PowerPC Virtual Ethernet driver that got broken by the
recent ppc64 iommu patch...

into ppc970.osdl.org:/home/torvalds/v2.5/linux

into ppc970.osdl.org:/home/torvalds/v2.5/linux

On Mon, Nov 17, 2003 at 02:57:44PM -0800, Jean Tourrilhes wrote:
> On Sun, Nov 16, 2003 at 11:33:01PM +0000, Russell King wrote:
> > Jean,
> >
> > Could you please arrange for this patch to be tested?  It covers all
> > the PCMCIA wireless drivers in 2.6.0-test9; I haven't been able to
> > test.
>
> 	Dual P500, kernel 2.6.0-test9 + your patch.
> -------------------------------------------------
>...
> 	Few comments :
> 	o Yanked the cards out of the socket, cardmgr did ifconfig
> down and removal of module automatically.
> 	o I did not see any patch for the Orinoco driver, but I did
> not check if it needs one. Did not look at HostAP either...
> 	o wl3501_cs : ask Arnaldo.
> 	o With 2.6.0-test9, I had instances of "can't read CIS". I
> actually had to reboot to perform the test.
> 	o The kobject Oops is something I think I saw before. I never
> remove my Aironet card because I don't want to reboot :-( This time,
> it seems to have survived better, so I see that as progress ;-)

This patch seems to have been forgotten about, so here it is again,
this time against 2.6.4-rc1.  This really needs to be send upstream,
though I don't know where we got to with this one.  Maybe we should
put it in akpm's tree for a while?

It's essentially more of the "don't deadlock if you pull out a
PCMCIA network card and it's currently configured up" patch which
went in recently for PCMCIA NIC cards.

>>>>> "Pawel" == Pawe  <Pawe> writes:

Pawel> On 2.6.3 it just Oopsed and didn't work. On 2.6.4-rc1 it does
Pawel> not oops but it doesn't work (neither as module nor as build in kernel).

Note that hp100 in 2.6.4-rc1 is still broken wrt EISA probing, since
it lacks the terminating entry in the EISA ID list. This one-liner
should take care of random crashes that are often reported to LKML :

===== drivers/net/hp100.c 1.24 vs edited =====

into ppc970.osdl.org:/home/torvalds/v2.5/linux

into ppc970.osdl.org:/home/torvalds/v2.5/linux

To hotplug-remove virtual devices, we need vio_find_node() so we have a
pointer to pass to vio_unregister_device().

vio_dev->unit_address only holds 32 bits of information anyways, so no
need for 64-bit field.

From Barry K. Nathan

This fixes the ulblp transfer length code, which would otherwise skip
the final iteration and lead to incomplete printer output (and us
waiting forever for the transfer to complete)

into kernel.bkbits.net:/home/davem/sparc-2.6

into nuts.davemloft.net:/disk1/BK/sparc-2.6

into debian.org:/usr/src/kernel/sparc-2.6

Here's a much better version.  The real bug was of course that the
get_user/put_user for data_direction were transposed.

This patch also fixes the translation of "quiet" and "timeout" to be
safer and clearer (instead of memcpying them as two ints and knowing
that "quiet" is first and assuming that "compat_int_t" is always the
same as the native "int", the code now handles them explicitly).

We should use "access_ok()" and __get_user/__put_user to generate better
code for this, but it's not performance-critical, so we don't care.
Some other day, perhaps.

Previous Kconfig change was incorrect, this is a better one.

On Fri, 27 Feb 2004, Linus Torvalds wrote:
> Ok, as usual, there was a lot of stuff for the -rc1, but as seems to be
> more and more true it is mainly in the "periphery".
>
> Andrew Morton:
>   o m68k: Amiga Hydra Ethernet new driver model

This part of the patch seems to have been lost (root_hydra_dev is no more):

The SA1111 appears to re-trigger an interrupt immediately following
a successful interrupt, despite no interrupt actually pending.

in our error handling thread callback.

This also exports scsi_finish_command in the SCSI layer.

Thanks much to James Bottomley and his patience, as this solution
was figured out.

Update ICS IDE driver with ide-dma and bio changes.